redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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>
This commit is contained in:
Stephen Boyd 2014-03-26 16:06:37 -07:00 committed by Mike Turquette
parent 8f2c2db132
commit 63589e92c2
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/clk/clk.c
View file

@ -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);