1 files changed, 0 insertions, 41 deletions
diff --git a/arch/arm/mach-omap2/clkt_iclk.c b/arch/arm/mach-omap2/clkt_iclk.c
index 650c8c77a573..f10eb03ce3e2 100644
--- a/arch/arm/mach-omap2/clkt_iclk.c
+++ b/arch/arm/mach-omap2/clkt_iclk.c
@@ -11,11 +11,7 @@
 #undef DEBUG
 #include <linux/kernel.h>
-#ifdef CONFIG_COMMON_CLK
 #include <linux/clk-provider.h>
-#else
-#include <linux/clk.h>
-#endif
 #include <linux/io.h>
@@ -27,11 +23,7 @@
 /* Private functions */
 /* XXX */
-#ifdef CONFIG_COMMON_CLK
 void omap2_clkt_iclk_allow_idle(struct clk_hw_omap *clk)
-#else
-void omap2_clkt_iclk_allow_idle(struct clk *clk)
-#endif
 {
        u32 v, r;
@@ -43,11 +35,7 @@ void omap2_clkt_iclk_allow_idle(struct clk *clk)
 }
 /* XXX */
-#ifdef CONFIG_COMMON_CLK
 void omap2_clkt_iclk_deny_idle(struct clk_hw_omap *clk)
-#else
-void omap2_clkt_iclk_deny_idle(struct clk *clk)
-#endif
 {
        u32 v, r;
@@ -60,7 +48,6 @@ void omap2_clkt_iclk_deny_idle(struct clk *clk)
 /* Public data */
-#ifdef CONFIG_COMMON_CLK
 const struct clk_hw_omap_ops clkhwops_iclk = {
        .allow_idle     = omap2_clkt_iclk_allow_idle,
        .deny_idle      = omap2_clkt_iclk_deny_idle,
@@ -72,34 +59,6 @@ const struct clk_hw_omap_ops clkhwops_iclk_wait = {
        .find_idlest    = omap2_clk_dflt_find_idlest,
        .find_companion = omap2_clk_dflt_find_companion,
 };
-#else
-const struct clkops clkops_omap2_iclk_dflt_wait = {
-        .enable         = omap2_dflt_clk_enable,
-        .disable        = omap2_dflt_clk_disable,
-        .find_companion = omap2_clk_dflt_find_companion,
-        .find_idlest    = omap2_clk_dflt_find_idlest,
-        .allow_idle     = omap2_clkt_iclk_allow_idle,
-        .deny_idle      = omap2_clkt_iclk_deny_idle,
-};
-const struct clkops clkops_omap2_iclk_dflt = {
-        .enable         = omap2_dflt_clk_enable,
-        .disable        = omap2_dflt_clk_disable,
-        .allow_idle     = omap2_clkt_iclk_allow_idle,
-        .deny_idle      = omap2_clkt_iclk_deny_idle,
-};
-const struct clkops clkops_omap2_iclk_idle_only = {
-        .allow_idle     = omap2_clkt_iclk_allow_idle,
-        .deny_idle      = omap2_clkt_iclk_deny_idle,
-};
-const struct clkops clkops_omap2_mdmclk_dflt_wait = {
-        .enable         = omap2_dflt_clk_enable,
-        .disable        = omap2_dflt_clk_disable,
-        .find_companion = omap2_clk_dflt_find_companion,
-        .find_idlest    = omap2_clk_dflt_find_idlest,
-        .allow_idle     = omap2_clkt_iclk_allow_idle,
-        .deny_idle      = omap2_clkt_iclk_deny_idle,
-};
-#endif

diff --git a/arch/arm/mach-omap2/clkt_iclk.c b/arch/arm/mach-omap2/clkt_iclk.c index 650c8c77a573..f10eb03ce3e2 100644 --- a/arch/arm/mach-omap2/clkt_iclk.c +++ b/arch/arm/mach-omap2/clkt_iclk.c
@@ -11,11 +11,7 @@
11	#undef DEBUG	11	#undef DEBUG
12		12
13	#include <linux/kernel.h>	13	#include <linux/kernel.h>
14	#ifdef CONFIG_COMMON_CLK
15	#include <linux/clk-provider.h>	14	#include <linux/clk-provider.h>
16	#else
17	#include <linux/clk.h>
18	#endif
19	#include <linux/io.h>	15	#include <linux/io.h>
20		16
21		17
@@ -27,11 +23,7 @@
27	/* Private functions */	23	/* Private functions */
28		24
29	/* XXX */	25	/* XXX */
30	#ifdef CONFIG_COMMON_CLK
31	void omap2_clkt_iclk_allow_idle(struct clk_hw_omap *clk)	26	void omap2_clkt_iclk_allow_idle(struct clk_hw_omap *clk)
32	#else
33	void omap2_clkt_iclk_allow_idle(struct clk *clk)
34	#endif
35	{	27	{
36	u32 v, r;	28	u32 v, r;
37		29
@@ -43,11 +35,7 @@ void omap2_clkt_iclk_allow_idle(struct clk *clk)
43	}	35	}
44		36
45	/* XXX */	37	/* XXX */
46	#ifdef CONFIG_COMMON_CLK
47	void omap2_clkt_iclk_deny_idle(struct clk_hw_omap *clk)	38	void omap2_clkt_iclk_deny_idle(struct clk_hw_omap *clk)
48	#else
49	void omap2_clkt_iclk_deny_idle(struct clk *clk)
50	#endif
51	{	39	{
52	u32 v, r;	40	u32 v, r;
53		41
@@ -60,7 +48,6 @@ void omap2_clkt_iclk_deny_idle(struct clk *clk)
60		48
61	/* Public data */	49	/* Public data */
62		50
63	#ifdef CONFIG_COMMON_CLK
64	const struct clk_hw_omap_ops clkhwops_iclk = {	51	const struct clk_hw_omap_ops clkhwops_iclk = {
65	.allow_idle = omap2_clkt_iclk_allow_idle,	52	.allow_idle = omap2_clkt_iclk_allow_idle,
66	.deny_idle = omap2_clkt_iclk_deny_idle,	53	.deny_idle = omap2_clkt_iclk_deny_idle,
@@ -72,34 +59,6 @@ const struct clk_hw_omap_ops clkhwops_iclk_wait = {
72	.find_idlest = omap2_clk_dflt_find_idlest,	59	.find_idlest = omap2_clk_dflt_find_idlest,
73	.find_companion = omap2_clk_dflt_find_companion,	60	.find_companion = omap2_clk_dflt_find_companion,
74	};	61	};
75	#else
76	const struct clkops clkops_omap2_iclk_dflt_wait = {
77	.enable = omap2_dflt_clk_enable,
78	.disable = omap2_dflt_clk_disable,
79	.find_companion = omap2_clk_dflt_find_companion,
80	.find_idlest = omap2_clk_dflt_find_idlest,
81	.allow_idle = omap2_clkt_iclk_allow_idle,
82	.deny_idle = omap2_clkt_iclk_deny_idle,
83	};
84		62
85	const struct clkops clkops_omap2_iclk_dflt = {
86	.enable = omap2_dflt_clk_enable,
87	.disable = omap2_dflt_clk_disable,
88	.allow_idle = omap2_clkt_iclk_allow_idle,
89	.deny_idle = omap2_clkt_iclk_deny_idle,
90	};
91		63
92	const struct clkops clkops_omap2_iclk_idle_only = {
93	.allow_idle = omap2_clkt_iclk_allow_idle,
94	.deny_idle = omap2_clkt_iclk_deny_idle,
95	};
96		64
97	const struct clkops clkops_omap2_mdmclk_dflt_wait = {
98	.enable = omap2_dflt_clk_enable,
99	.disable = omap2_dflt_clk_disable,
100	.find_companion = omap2_clk_dflt_find_companion,
101	.find_idlest = omap2_clk_dflt_find_idlest,
102	.allow_idle = omap2_clkt_iclk_allow_idle,
103	.deny_idle = omap2_clkt_iclk_deny_idle,
104	};
105	#endif