diff options
| author | Mike Turquette <mturquette@ti.com> | 2012-11-07 13:14:47 -0800 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-11-12 19:18:51 -0700 |
| commit | f9ae32a74f0242cbef76d9baa10993d707be1714 (patch) | |
| tree | 4c9e616bd4a72879405b94b039ee26ca812bed14 /arch/arm/mach-omap2/clockdomain.c | |
| parent | f51e0f9862ccf8be71219763d51e7617b95faa10 (diff) | |
ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts
Clean all #ifdef's added to common clock code. This code is no longer
needed due to migration to the common clock framework.
Signed-off-by: Mike Turquette <mturquette@ti.com>
[paul@pwsan.com: clean up new ifdefs added in clockdomain.c]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/clockdomain.c')
| -rw-r--r-- | arch/arm/mach-omap2/clockdomain.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c index be6fe356ddba..384873580b23 100644 --- a/arch/arm/mach-omap2/clockdomain.c +++ b/arch/arm/mach-omap2/clockdomain.c @@ -997,11 +997,9 @@ int clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk) spin_lock_irqsave(&clkdm->lock, flags); -#ifdef CONFIG_COMMON_CLK /* corner case: disabling unused clocks */ if (__clk_get_enable_count(clk) == 0) goto ccd_exit; -#endif if (atomic_read(&clkdm->usecount) == 0) { spin_unlock_irqrestore(&clkdm->lock, flags); @@ -1019,9 +1017,7 @@ int clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk) pr_debug("clockdomain: %s: disabled\n", clkdm->name); -#ifdef CONFIG_COMMON_CLK ccd_exit: -#endif spin_unlock_irqrestore(&clkdm->lock, flags); return 0; |