clk: Silence warnings about lock imbalances
authorStephen Boyd <sboyd@codeaurora.org>
Fri, 24 Jul 2015 19:24:48 +0000 (12:24 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Tue, 28 Jul 2015 18:59:30 +0000 (11:59 -0700)
The recursive spinlock implementation trips up sparse and it
complains that these functions have lock imbalances. That isn't
really true though, so add some __acquires() and __releases()
information so that sparse is quiet.

drivers/clk/clk.c:116:22: warning: context imbalance in 'clk_enable_lock' - wrong count at exit
drivers/clk/clk.c:141:9: warning: context imbalance in 'clk_enable_unlock' - unexpected unlock

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/clk.c

index 819ffa6db83d7cd0c792262c4705ad6dfa2db1eb..898052ee0efade136d385e3e8e3a158b36750ebd 100644 (file)
@@ -114,12 +114,14 @@ static void clk_prepare_unlock(void)
 }
 
 static unsigned long clk_enable_lock(void)
+       __acquires(enable_lock)
 {
        unsigned long flags;
 
        if (!spin_trylock_irqsave(&enable_lock, flags)) {
                if (enable_owner == current) {
                        enable_refcnt++;
+                       __acquire(enable_lock);
                        return flags;
                }
                spin_lock_irqsave(&enable_lock, flags);
@@ -132,12 +134,15 @@ static unsigned long clk_enable_lock(void)
 }
 
 static void clk_enable_unlock(unsigned long flags)
+       __releases(enable_lock)
 {
        WARN_ON_ONCE(enable_owner != current);
        WARN_ON_ONCE(enable_refcnt == 0);
 
-       if (--enable_refcnt)
+       if (--enable_refcnt) {
+               __release(enable_lock);
                return;
+       }
        enable_owner = NULL;
        spin_unlock_irqrestore(&enable_lock, flags);
 }