Skip to content

Commit

Permalink
ARM: EXYNOS: Kill exynos_pm_late_initcall()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sylwester Nawrocki authored and Kukjin Kim committed Dec 20, 2013
1 parent 2628288 commit 1fd3cbc
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
3 changes: 2 additions & 1 deletion arch/arm/mach-exynos/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <linux/of.h>
#include <linux/of_fdt.h>
#include <linux/of_irq.h>
#include <linux/pm_domain.h>
#include <linux/export.h>
#include <linux/irqdomain.h>
#include <linux/of_address.h>
Expand Down Expand Up @@ -308,7 +309,7 @@ void __init exynos_init_late(void)
/* to be supported later */
return;

exynos_pm_late_initcall();
pm_genpd_poweroff_unused();
}

static int __init exynos_fdt_map_chipid(unsigned long node, const char *uname,
Expand Down
6 changes: 0 additions & 6 deletions arch/arm/mach-exynos/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ void exynos_init_late(void);

void exynos_firmware_init(void);

#ifdef CONFIG_PM_GENERIC_DOMAINS
int exynos_pm_late_initcall(void);
#else
static inline int exynos_pm_late_initcall(void) { return 0; }
#endif

extern struct smp_operations exynos_smp_ops;

extern void exynos_cpu_die(unsigned int cpu);
Expand Down
6 changes: 0 additions & 6 deletions arch/arm/mach-exynos/pm_domains.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,3 @@ static __init int exynos4_pm_init_power_domain(void)
return 0;
}
arch_initcall(exynos4_pm_init_power_domain);

int __init exynos_pm_late_initcall(void)
{
pm_genpd_poweroff_unused();
return 0;
}

0 comments on commit 1fd3cbc

Please sign in to comment.