aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-04 11:48:35 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-08 06:38:39 -0500
commit57137181e3136d4c7b20b4b95b9817efd38f8f07 (patch)
tree3a5986311d910db1a0f721e5e1cbe3f3d056fd66 /arch/arm/mach-omap2/clock.c
parent897dcded6fb6565f4d1c22a55d21f135403db132 (diff)
[ARM] omap: kill PARENT_CONTROLS_CLOCK
PARENT_CONTROLS_CLOCK just makes enable/disable no-op, and is functionally an alias for ALWAYS_ENABLED. This can be handled in the same way, using clkops_null. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
-rw-r--r--arch/arm/mach-omap2/clock.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index fa99c0b71d3..21fbe29810a 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -271,9 +271,6 @@ int _omap2_clk_enable(struct clk *clk)
271{ 271{
272 u32 regval32; 272 u32 regval32;
273 273
274 if (clk->flags & PARENT_CONTROLS_CLOCK)
275 return 0;
276
277 if (clk->ops && clk->ops->enable) 274 if (clk->ops && clk->ops->enable)
278 return clk->ops->enable(clk); 275 return clk->ops->enable(clk);
279 276
@@ -301,9 +298,6 @@ void _omap2_clk_disable(struct clk *clk)
301{ 298{
302 u32 regval32; 299 u32 regval32;
303 300
304 if (clk->flags & PARENT_CONTROLS_CLOCK)
305 return;
306
307 if (clk->ops && clk->ops->disable) { 301 if (clk->ops && clk->ops->disable) {
308 clk->ops->disable(clk); 302 clk->ops->disable(clk);
309 return; 303 return;