Every OMAP2/3 clock must now have an assigned clockdomain, so we can remove the checks from clk_enable()/clk_disable().
Ideally we would verify that the clockdomain is present during clk_register(), but this is kind of a pain since OMAP1 doesn't have the clkdm union in its struct clk. In the future we should extend arch_clocks to take architecture-specific clk_register() and clk_unregister() functions to handle this kind of situation. Signed-off-by: Paul Walmsley <[email protected]> --- arch/arm/mach-omap2/clock.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index 0946a5a..cdad2ae 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -202,6 +202,7 @@ void omap2_init_clk_clkdm(struct clk *clk) if (!clk->clkdm.name) { pr_err("clock: %s: missing clockdomain", clk->name); + WARN_ON(1); return; } @@ -481,8 +482,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); } } @@ -500,14 +500,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); -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
