Skip to contentSkip to conversation

ARM: EXYNOS: Kill exynos_pm_late_initcall()

PATCH New Sylwester Nawrocki 2 participants 3 messages Dec 20, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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().

---
 arch/arm/mach-exynos/common.c     |    3 ++-
 arch/arm/mach-exynos/common.h     |    6 ------
 arch/arm/mach-exynos/pm_domains.c |    6 ------
 3 files changed, 2 insertions(+), 13 deletions(-)
arch/arm/mach-exynos/common.c +2 -1
index 8ae4797..09e6898 100644
@@ -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>
@@ -324,7 +325,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,
arch/arm/mach-exynos/common.h +0 -6
index ff9b6a9..0c31b34 100644
@@ -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);
arch/arm/mach-exynos/pm_domains.c +0 -6
index ff50836..8fd2488 100644
@@ -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;
-}
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/1 ARM: EXYNOS: Kill exynos_pm_late_initcall()

Quoted 56 lines · Sylwester Nawrocki

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().

---
  arch/arm/mach-exynos/common.c     |    3 ++-
  arch/arm/mach-exynos/common.h     |    6 ------
  arch/arm/mach-exynos/pm_domains.c |    6 ------
  3 files changed, 2 insertions(+), 13 deletions(-)
arch/arm/mach-exynos/common.c +2 -1
index 8ae4797..09e6898 100644
@@ -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>
@@ -324,7 +325,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,
arch/arm/mach-exynos/common.h +0 -6
index ff9b6a9..0c31b34 100644
@@ -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);
arch/arm/mach-exynos/pm_domains.c +0 -0
index ff50836..8fd2488 100644

arch/arm/mach-exynos/pm_domains.c static __init int exynos4_pm_init_power_domain(void) · line 192

Quoted 9 lines
arch/arm/mach-exynos/pm_domains.c +0 -6
@@ -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;
-}

Yes, right. Applied BTW, how about same thing in mach-s3c64xx? ;-)

Thanks and Merry Christmas.

- Kukjin

#2 lore raw

PATCH 1/1 ARM: EXYNOS: Kill exynos_pm_late_initcall()

Quoted 64 lines · Kukjin Kim
Quoted 63 lines · Sylwester Nawrocki

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().

---
arch/arm/mach-exynos/common.c | 3 ++-
arch/arm/mach-exynos/common.h | 6 ------
arch/arm/mach-exynos/pm_domains.c | 6 ------

3 files changed, 2 insertions(+), 13 deletions(-)
arch/arm/mach-exynos/common.c +2 -1
index 8ae4797..09e6898 100644
@@ -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>
@@ -324,7 +325,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,

arch/arm/mach-exynos/common.h +0 -6
index ff9b6a9..0c31b34 100644
@@ -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);
arch/arm/mach-exynos/pm_domains.c +0 -0
index ff50836..8fd2488 100644
@@ -184,9 +184,3 @@ static __init int exynos4_pm_init_power_domain(void)
 return 0;
 }
 arch_initcall(exynos4_pm_init_power_domain);
Quoted 8 lines

arch/arm/mach-exynos/pm_domains.c static __init int exynos4_pm_init_power_domain(void) · line 192

Quoted 6 lines
arch/arm/mach-exynos/pm_domains.c +0 -6
-
-int __init exynos_pm_late_initcall(void)
-{
- pm_genpd_poweroff_unused();
- return 0;
-}

Yes, right. Applied BTW, how about same thing in mach-s3c64xx? ;-)

Good point, unfortunately I don't have time for it neither possibility to test. Hopefully someone else can handle that.

Quoted 1 line

Thanks and Merry Christmas.

Thank you for quick response. Merry Christmas and Happy New Year.