Commit f79299ca authored by eric miao's avatar eric miao Committed by Russell King

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

Signed-off-by: default avatareric miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8785a8fb
...@@ -239,6 +239,8 @@ static void __init pxa25x_init_pm(void) ...@@ -239,6 +239,8 @@ static void __init pxa25x_init_pm(void)
{ {
pxa_cpu_pm_fns = &pxa25x_cpu_pm_fns; pxa_cpu_pm_fns = &pxa25x_cpu_pm_fns;
} }
#else
static inline void pxa25x_init_pm(void) {}
#endif #endif
/* PXA25x: supports wakeup from GPIO0..GPIO15 and RTC alarm /* PXA25x: supports wakeup from GPIO0..GPIO15 and RTC alarm
...@@ -310,9 +312,9 @@ static int __init pxa25x_init(void) ...@@ -310,9 +312,9 @@ static int __init pxa25x_init(void)
if ((ret = pxa_init_dma(16))) if ((ret = pxa_init_dma(16)))
return ret; return ret;
#ifdef CONFIG_PM
pxa25x_init_pm(); pxa25x_init_pm();
#endif
ret = platform_add_devices(pxa25x_devices, ret = platform_add_devices(pxa25x_devices,
ARRAY_SIZE(pxa25x_devices)); ARRAY_SIZE(pxa25x_devices));
} }
......
...@@ -306,6 +306,8 @@ static void __init pxa27x_init_pm(void) ...@@ -306,6 +306,8 @@ static void __init pxa27x_init_pm(void)
{ {
pxa_cpu_pm_fns = &pxa27x_cpu_pm_fns; pxa_cpu_pm_fns = &pxa27x_cpu_pm_fns;
} }
#else
static inline void pxa27x_init_pm(void) {}
#endif #endif
/* PXA27x: Various gpios can issue wakeup events. This logic only /* PXA27x: Various gpios can issue wakeup events. This logic only
...@@ -415,9 +417,9 @@ static int __init pxa27x_init(void) ...@@ -415,9 +417,9 @@ static int __init pxa27x_init(void)
if ((ret = pxa_init_dma(32))) if ((ret = pxa_init_dma(32)))
return ret; return ret;
#ifdef CONFIG_PM
pxa27x_init_pm(); pxa27x_init_pm();
#endif
ret = platform_add_devices(devices, ARRAY_SIZE(devices)); ret = platform_add_devices(devices, ARRAY_SIZE(devices));
} }
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment