Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[karo-tx-linux.git] / drivers / sh / clk.c

diff --git a/drivers/sh/clk.c b/drivers/sh/clk.c
index c90a3e1e1085b582f49d2603aeccab22b9a018f5..5d84adac9ec499beebd50c303a5b0fb71f2cca5d 100644 (file)
--- a/drivers/sh/clk.c
+++ b/drivers/sh/clk.c
@@ -160,12 +160,9 @@ void propagate_rate(struct clk *tclk)
 
 static void __clk_disable(struct clk *clk)
 {
-       if (clk->usecount == 0) {
-               printk(KERN_ERR "Trying disable clock %s with 0 usecount\n",
-                      clk->name);
-               WARN_ON(1);
+       if (WARN(!clk->usecount, "Trying to disable clock %s with 0 usecount\n",
+                clk->name))
                return;
-       }
 
        if (!(--clk->usecount)) {
                if (likely(clk->ops && clk->ops->disable))