clk: Ignore error and NULL pointers passed to clk_{unprepare, disable}()

This simplifies error paths in drivers that use optional clocks
by allowing the NULL or error pointer to be passed
unconditionally.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 3c02be74fd7c250fcd859edb2fe2a46cfd0de887..4d562206d62f193ae9b4036505d067c2638c8127 100644 (file)
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -822,6 +822,9 @@ void __clk_unprepare(struct clk *clk)
  */
 void clk_unprepare(struct clk *clk)
 {
+       if (IS_ERR_OR_NULL(clk))
+               return;
+
        clk_prepare_lock();
        __clk_unprepare(clk);
        clk_prepare_unlock();
@@ -883,9 +886,6 @@ static void __clk_disable(struct clk *clk)
        if (!clk)
                return;
 
-       if (WARN_ON(IS_ERR(clk)))
-               return;
-
        if (WARN_ON(clk->enable_count == 0))
                return;
 
@@ -914,6 +914,9 @@ void clk_disable(struct clk *clk)
 {
        unsigned long flags;
 
+       if (IS_ERR_OR_NULL(clk))
+               return;
+
        flags = clk_enable_lock();
        __clk_disable(clk);
        clk_enable_unlock(flags);