[ARM] pxa: clean up pxa{27x,25x}_init_pm() to empty if CONFIG_PM not defined

Signed-off-by: eric miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index c6ea0ed692702501a63a9e64cb02e4c1d3fb7152..962cfbb5500ea6ed2a27547534190e5d0359fc17 100644 (file)
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -239,6 +239,8 @@ static void __init pxa25x_init_pm(void)
 {
        pxa_cpu_pm_fns = &pxa25x_cpu_pm_fns;
 }
+#else
+static inline void pxa25x_init_pm(void) {}
 #endif
 
 /* PXA25x: supports wakeup from GPIO0..GPIO15 and RTC alarm
@@ -310,9 +312,9 @@ static int __init pxa25x_init(void)
 
                if ((ret = pxa_init_dma(16)))
                        return ret;
-#ifdef CONFIG_PM
+
                pxa25x_init_pm();
-#endif
+
                ret = platform_add_devices(pxa25x_devices,
                                           ARRAY_SIZE(pxa25x_devices));
        }

diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index b9fa5ec0a954aac9e7b99c6d9ff61cc03146e47e..f33c9d7ff87e8db15b648a46ed12de5bc83ef36e 100644 (file)
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -306,6 +306,8 @@ static void __init pxa27x_init_pm(void)
 {
        pxa_cpu_pm_fns = &pxa27x_cpu_pm_fns;
 }
+#else
+static inline void pxa27x_init_pm(void) {}
 #endif
 
 /* PXA27x:  Various gpios can issue wakeup events.  This logic only
@@ -415,9 +417,9 @@ static int __init pxa27x_init(void)
 
                if ((ret = pxa_init_dma(32)))
                        return ret;
-#ifdef CONFIG_PM
+
                pxa27x_init_pm();
-#endif
+
                ret = platform_add_devices(devices, ARRAY_SIZE(devices));
        }
        return ret;