The only thing __clk_enable/__clk_disable does is NULL pointer checking
of clk except calling clk_core_{enable|disable} which is already handled
by clk_core_{enable|disable}.
So remove this unneeded function.Cc: Mike Turquette <[email protected]> Cc: Stephen Boyd <[email protected]> Signed-off-by: Dong Aisheng <[email protected]> --- drivers/clk/clk.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 492644f..7af553d 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1023,14 +1023,6 @@ static void clk_core_disable(struct clk_core *clk) clk_core_disable(clk->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 *clk) 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 @@ -1116,7 +1100,7 @@ int clk_enable(struct clk *clk) int ret; flags = clk_enable_lock(); - ret = __clk_enable(clk); + ret = clk_core_enable(clk->core); clk_enable_unlock(flags); return ret; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
