aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
-rw-r--r--arch/arm/mach-omap2/clock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 2a2f15213add..e9625fcf6390 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -264,7 +264,7 @@ void omap2_clk_disable(struct clk *clk)
264 clk->ops->disable(clk); 264 clk->ops->disable(clk);
265 265
266 if (clk->clkdm) 266 if (clk->clkdm)
267 omap2_clkdm_clk_disable(clk->clkdm, clk); 267 clkdm_clk_disable(clk->clkdm, clk);
268 268
269 if (clk->parent) 269 if (clk->parent)
270 omap2_clk_disable(clk->parent); 270 omap2_clk_disable(clk->parent);
@@ -304,7 +304,7 @@ int omap2_clk_enable(struct clk *clk)
304 } 304 }
305 305
306 if (clk->clkdm) { 306 if (clk->clkdm) {
307 ret = omap2_clkdm_clk_enable(clk->clkdm, clk); 307 ret = clkdm_clk_enable(clk->clkdm, clk);
308 if (ret) { 308 if (ret) {
309 WARN(1, "clock: %s: could not enable clockdomain %s: " 309 WARN(1, "clock: %s: could not enable clockdomain %s: "
310 "%d\n", clk->name, clk->clkdm->name, ret); 310 "%d\n", clk->name, clk->clkdm->name, ret);
@@ -322,7 +322,7 @@ int omap2_clk_enable(struct clk *clk)
322 322
323oce_err3: 323oce_err3:
324 if (clk->clkdm) 324 if (clk->clkdm)
325 omap2_clkdm_clk_disable(clk->clkdm, clk); 325 clkdm_clk_disable(clk->clkdm, clk);
326oce_err2: 326oce_err2:
327 if (clk->parent) 327 if (clk->parent)
328 omap2_clk_disable(clk->parent); 328 omap2_clk_disable(clk->parent);