1 files changed, 0 insertions, 52 deletions

diff --git a/arch/arm/mach-omap2/clkt2xxx_apll.c b/arch/arm/mach-omap2/clkt2xxx_apll.c
index 76a958c6e5bc..25b1feed480d 100644
--- a/arch/arm/mach-omap2/clkt2xxx_apll.c
+++ b/arch/arm/mach-omap2/clkt2xxx_apll.c
@@ -38,7 +38,6 @@
 
 /* Private functions */
 
-#ifdef CONFIG_COMMON_CLK
 /**
  * omap2xxx_clk_apll_locked - is the APLL locked?
  * @hw: struct clk_hw * of the APLL to check
@@ -57,81 +56,47 @@ static bool omap2xxx_clk_apll_locked(struct clk_hw *hw)
 
         return ((r & apll_mask) == apll_mask) ? true : false;
 }
-#endif
 
-#ifdef CONFIG_COMMON_CLK
 int omap2_clk_apll96_enable(struct clk_hw *hw)
-#else
-static int _apll96_enable(struct clk *clk)
-#endif
 {
         return omap2xxx_cm_apll96_enable();
 }
 
-#ifdef CONFIG_COMMON_CLK
 int omap2_clk_apll54_enable(struct clk_hw *hw)
-#else
-static int _apll54_enable(struct clk *clk)
-#endif
 {
         return omap2xxx_cm_apll54_enable();
 }
 
-#ifdef CONFIG_COMMON_CLK
 static void _apll96_allow_idle(struct clk_hw_omap *clk)
-#else
-static void _apll96_allow_idle(struct clk *clk)
-#endif
 {
         omap2xxx_cm_set_apll96_auto_low_power_stop();
 }
 
-#ifdef CONFIG_COMMON_CLK
 static void _apll96_deny_idle(struct clk_hw_omap *clk)
-#else
-static void _apll96_deny_idle(struct clk *clk)
-#endif
 {
         omap2xxx_cm_set_apll96_disable_autoidle();
 }
 
-#ifdef CONFIG_COMMON_CLK
 static void _apll54_allow_idle(struct clk_hw_omap *clk)
-#else
-static void _apll54_allow_idle(struct clk *clk)
-#endif
 {
         omap2xxx_cm_set_apll54_auto_low_power_stop();
 }
 
-#ifdef CONFIG_COMMON_CLK
 static void _apll54_deny_idle(struct clk_hw_omap *clk)
-#else
-static void _apll54_deny_idle(struct clk *clk)
-#endif
 {
         omap2xxx_cm_set_apll54_disable_autoidle();
 }
 
-#ifdef CONFIG_COMMON_CLK
 void omap2_clk_apll96_disable(struct clk_hw *hw)
-#else
-static void _apll96_disable(struct clk *clk)
-#endif
 {
         omap2xxx_cm_apll96_disable();
 }
 
-#ifdef CONFIG_COMMON_CLK
 void omap2_clk_apll54_disable(struct clk_hw *hw)
-#else
-static void _apll54_disable(struct clk *clk)
-#endif
 {
         omap2xxx_cm_apll54_disable();
 }
 
-#ifdef CONFIG_COMMON_CLK
 unsigned long omap2_clk_apll54_recalc(struct clk_hw *hw,
                                       unsigned long parent_rate)
 {
@@ -143,10 +108,8 @@ unsigned long omap2_clk_apll96_recalc(struct clk_hw *hw,
 {
         return (omap2xxx_clk_apll_locked(hw)) ? 96000000 : 0;
 }
-#endif
 
 /* Public data */
-#ifdef CONFIG_COMMON_CLK
 const struct clk_hw_omap_ops clkhwops_apll54 = {
         .allow_idle     = _apll54_allow_idle,
         .deny_idle      = _apll54_deny_idle,
@@ -156,21 +119,6 @@ const struct clk_hw_omap_ops clkhwops_apll96 = {
         .allow_idle     = _apll96_allow_idle,
         .deny_idle      = _apll96_deny_idle,
 };
-#else
-const struct clkops clkops_apll96 = {
-        .enable         = _apll96_enable,
-        .disable        = _apll96_disable,
-        .allow_idle     = _apll96_allow_idle,
-        .deny_idle      = _apll96_deny_idle,
-};
-
-const struct clkops clkops_apll54 = {
-        .enable         = _apll54_enable,
-        .disable        = _apll54_disable,
-        .allow_idle     = _apll54_allow_idle,
-        .deny_idle      = _apll54_deny_idle,
-};
-#endif
 
 /* Public functions */