Messages in this thread Patch in this message | | | From | Paul Walmsley <> | Subject | [PATCH F 06/12] OMAP2/3 clock: every clock must have a clkdm | Date | Wed, 28 Jan 2009 12:35:15 -0700 |
| |
Every OMAP2/3 clock must now have an assigned clockdomain, so we can remove the checks from clk_enable()/clk_disable(). Instead, verify that the clockdomain is present only at clock init time via the arch_clock clk_register() hook.
linux-omap source commit is 60b8b431e47d8c5b8c02a2e4fa9af388aae20790.
Signed-off-by: Paul Walmsley <paul@pwsan.com> Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/clock.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index c93a5aa..600b2f4 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -199,11 +199,6 @@ void omap2_init_clk_clkdm(struct clk *clk) { struct clockdomain *clkdm; - if (!clk->clkdm.name) { - pr_err("clock: %s: missing clockdomain", clk->name); - return; - } - clkdm = clkdm_lookup(clk->clkdm.name); if (clkdm) { pr_debug("clock: associated clk %s to clkdm %s\n", @@ -479,8 +474,7 @@ void omap2_clk_disable(struct clk *clk) _omap2_clk_disable(clk); if (clk->parent) omap2_clk_disable(clk->parent); - if (clk->clkdm.ptr) - omap2_clkdm_clk_disable(clk->clkdm.ptr, clk); + omap2_clkdm_clk_disable(clk->clkdm.ptr, clk); } } @@ -498,14 +492,12 @@ int omap2_clk_enable(struct clk *clk) return ret; } - if (clk->clkdm.ptr) - omap2_clkdm_clk_enable(clk->clkdm.ptr, clk); + omap2_clkdm_clk_enable(clk->clkdm.ptr, clk); ret = _omap2_clk_enable(clk); if (ret != 0) { - if (clk->clkdm.ptr) - omap2_clkdm_clk_disable(clk->clkdm.ptr, clk); + omap2_clkdm_clk_disable(clk->clkdm.ptr, clk); if (clk->parent) { omap2_clk_disable(clk->parent); @@ -1090,6 +1082,12 @@ void omap2_clk_disable_unused(struct clk *clk) int omap2_clk_register(struct clk *clk) { + if (!clk->clkdm.name) { + pr_debug("clock: %s: missing clockdomain", clk->name); + WARN_ON(1); + return -EINVAL; + } + omap2_init_clk_clkdm(clk); return 0; }
| |