diff options
| author | Dong Aisheng | 2015-04-30 23:02:19 +0200 |
|---|---|---|
| committer | Stephen Boyd | 2015-05-01 01:28:33 +0200 |
| commit | 864e160ae510f5223e7bd9aa4335d7e092173446 (patch) | |
| tree | 192f2e681c609834782f038ca09a1c9941086df1 /drivers/clk/clk.c | |
| parent | clk: s/clk/core/ for struct clk_core (diff) | |
| download | kernel-qcow2-linux-864e160ae510f5223e7bd9aa4335d7e092173446.tar.gz kernel-qcow2-linux-864e160ae510f5223e7bd9aa4335d7e092173446.tar.xz kernel-qcow2-linux-864e160ae510f5223e7bd9aa4335d7e092173446.zip | |
clk: Squash __clk_{enable,disable}() into callers
These functions are only used in one place. Let's squash them
into their respective callers to save some lines.
Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
[sboyd@codeaurora.org: Redo commit text, add NULL check in
clk_enable()]
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk/clk.c')
| -rw-r--r-- | drivers/clk/clk.c | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 0b3c914db1ca..88439af5d032 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1023,14 +1023,6 @@ static void clk_core_disable(struct clk_core *core) clk_core_disable(core->parent); } -static void __clk_disable(struct clk *clk) -{ - if (!clk) - return; - - clk_core_disable(clk->core); -} - /** * clk_disable - gate a clock * @clk: the clk being gated @@ -1051,7 +1043,7 @@ void clk_disable(struct clk *clk) return; flags = clk_enable_lock(); - __clk_disable(clk); + clk_core_disable(clk->core); clk_enable_unlock(flags); } EXPORT_SYMBOL_GPL(clk_disable); @@ -1089,14 +1081,6 @@ static int clk_core_enable(struct clk_core *core) return 0; } -static int __clk_enable(struct clk *clk) -{ - if (!clk) - return 0; - - return clk_core_enable(clk->core); -} - /** * clk_enable - ungate a clock * @clk: the clk being ungated @@ -1115,8 +1099,11 @@ int clk_enable(struct clk *clk) unsigned long flags; int ret; + if (!clk) + return 0; + flags = clk_enable_lock(); - ret = __clk_enable(clk); + ret = clk_core_enable(clk->core); clk_enable_unlock(flags); return ret; |