From: Rajendra Nayak <rnayak@xxxxxx>
Clean all #ifdef's added as part of fixing the clkdm
accesses from hwmod.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
Signed-off-by: Mike Turquette <mturquette@xxxxxx>
---
arch/arm/mach-omap2/omap_hwmod.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 22a41f6..25052d6 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -130,11 +130,7 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/io.h>
-#ifdef CONFIG_COMMON_CLK
#include <linux/clk-provider.h>
-#else
-#include <linux/clk.h>
-#endif
#include <linux/delay.h>
#include <linux/err.h>
#include <linux/list.h>
@@ -623,17 +619,13 @@ static int _disable_wakeup(struct omap_hwmod *oh, u32 *v)
struct clockdomain *_get_clkdm(struct omap_hwmod *oh)
{
+ struct clk_hw_omap *clk;
+
if (oh->clkdm) {
return oh->clkdm;
} else if (oh->_clk) {
-#ifdef CONFIG_COMMON_CLK
- struct clk_hw_omap *clk;
-
clk = to_clk_hw_omap(__clk_get_hw(oh->_clk));
return clk->clkdm;
-#else
- return oh->_clk->clkdm;
-#endif
}
return NULL;
}
@@ -3590,9 +3582,7 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh)
struct clk *c;
struct omap_hwmod_ocp_if *oi;
struct clockdomain *clkdm;
-#ifdef CONFIG_COMMON_CLK
struct clk_hw_omap *clk;
-#endif
if (!oh)
return NULL;
@@ -3609,12 +3599,8 @@ struct powerdomain *omap_hwmod_get_pwrdm(struct omap_hwmod *oh)
c = oi->_clk;
}
-#ifdef CONFIG_COMMON_CLK
clk = to_clk_hw_omap(__clk_get_hw(c));
clkdm = clk->clkdm;
-#else
- clkdm = c->clkdm;
-#endif
if (!clkdm)
return NULL;
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
