diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2013-12-20 16:33:30 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-12-20 16:40:44 -0500 |
commit | 1fd3cbccaf47aefbe3bfb026d310cd2f5d0685c6 (patch) | |
tree | e8082d270edf395251a84e182bbd3771e0f55035 | |
parent | 26282884035bab3286b03da19006dab9684d7242 (diff) |
ARM: EXYNOS: Kill exynos_pm_late_initcall()
The only thing exynos_pm_late_initcall() does is calling
pm_genpd_poweroff_unused(), which is already stubbed when
CONFIG_PM_GENERIC_DOMAINS is not enabled. So replace
exynos_pm_late_initcall() with a direct call to
pm_genpd_poweroff_unused().
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-exynos/common.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-exynos/common.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-exynos/pm_domains.c | 6 |
3 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c index 52cef6a2a825..72ae5d3a87d2 100644 --- a/arch/arm/mach-exynos/common.c +++ b/arch/arm/mach-exynos/common.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/of.h> | 23 | #include <linux/of.h> |
24 | #include <linux/of_fdt.h> | 24 | #include <linux/of_fdt.h> |
25 | #include <linux/of_irq.h> | 25 | #include <linux/of_irq.h> |
26 | #include <linux/pm_domain.h> | ||
26 | #include <linux/export.h> | 27 | #include <linux/export.h> |
27 | #include <linux/irqdomain.h> | 28 | #include <linux/irqdomain.h> |
28 | #include <linux/of_address.h> | 29 | #include <linux/of_address.h> |
@@ -308,7 +309,7 @@ void __init exynos_init_late(void) | |||
308 | /* to be supported later */ | 309 | /* to be supported later */ |
309 | return; | 310 | return; |
310 | 311 | ||
311 | exynos_pm_late_initcall(); | 312 | pm_genpd_poweroff_unused(); |
312 | } | 313 | } |
313 | 314 | ||
314 | static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname, | 315 | static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname, |
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index ff9b6a9419b0..0c31b34f0de5 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h | |||
@@ -26,12 +26,6 @@ void exynos_init_late(void); | |||
26 | 26 | ||
27 | void exynos_firmware_init(void); | 27 | void exynos_firmware_init(void); |
28 | 28 | ||
29 | #ifdef CONFIG_PM_GENERIC_DOMAINS | ||
30 | int exynos_pm_late_initcall(void); | ||
31 | #else | ||
32 | static inline int exynos_pm_late_initcall(void) { return 0; } | ||
33 | #endif | ||
34 | |||
35 | extern struct smp_operations exynos_smp_ops; | 29 | extern struct smp_operations exynos_smp_ops; |
36 | 30 | ||
37 | extern void exynos_cpu_die(unsigned int cpu); | 31 | extern void exynos_cpu_die(unsigned int cpu); |
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index ff508360d27c..8fd24882f0b1 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c | |||
@@ -184,9 +184,3 @@ static __init int exynos4_pm_init_power_domain(void) | |||
184 | return 0; | 184 | return 0; |
185 | } | 185 | } |
186 | arch_initcall(exynos4_pm_init_power_domain); | 186 | arch_initcall(exynos4_pm_init_power_domain); |
187 | |||
188 | int __init exynos_pm_late_initcall(void) | ||
189 | { | ||
190 | pm_genpd_poweroff_unused(); | ||
191 | return 0; | ||
192 | } | ||