Commit 18d4ecba authored by Paul Walmsley's avatar Paul Walmsley Committed by Tony Lindgren

OMAP2/3 clock: omap2_clk_enable(): refactor usecount check

Clean up omap2_clk_enable() by moving most of the function body out of
the usecount check.  Should result in no functional change.
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 60b8b431
...@@ -485,26 +485,27 @@ int omap2_clk_enable(struct clk *clk) ...@@ -485,26 +485,27 @@ int omap2_clk_enable(struct clk *clk)
{ {
int ret = 0; int ret = 0;
if (clk->usecount++ == 0) { if (++clk->usecount > 1)
if (clk->parent) return 0;
ret = omap2_clk_enable(clk->parent);
if (ret != 0) { if (clk->parent)
clk->usecount--; ret = omap2_clk_enable(clk->parent);
return ret;
} if (ret != 0) {
clk->usecount--;
return ret;
}
omap2_clkdm_clk_enable(clk->clkdm.ptr, clk); omap2_clkdm_clk_enable(clk->clkdm.ptr, clk);
ret = _omap2_clk_enable(clk); ret = _omap2_clk_enable(clk);
if (ret != 0) { if (ret != 0) {
omap2_clkdm_clk_disable(clk->clkdm.ptr, clk); omap2_clkdm_clk_disable(clk->clkdm.ptr, clk);
if (clk->parent) { if (clk->parent) {
omap2_clk_disable(clk->parent); omap2_clk_disable(clk->parent);
clk->usecount--; clk->usecount--;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment