ARM: tango: Improve ARCH_MULTIPLATFORM compatibility

mwgonzalez · arndb · commit d0f9f16788e1 · 2019-01-30T11:45:10.000+01:00
Calling platform-specific code unconditionally blows up when running an ARCH_MULTIPLATFORM kernel on a different platform. Don't do it. Reported-by: Paolo Pisati <p.pisati@gmail.com> Signed-off-by: Marc Gonzalez <marc.w.gonzalez@free.fr> Acked-by: Pavel Machek <pavel@ucw.cz> Cc: stable@vger.kernel.org # v4.8+ Fixes: a30eceb ("ARM: tango: add Suspend-to-RAM support") Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/arch/arm/mach-tango/pm.c b/arch/arm/mach-tango/pm.c
@@ -3,6 +3,7 @@
 #include <linux/suspend.h>
 #include <asm/suspend.h>
 #include "smc.h"
+#include "pm.h"
 
 static int tango_pm_powerdown(unsigned long arg)
 {
@@ -24,10 +25,7 @@ static const struct platform_suspend_ops tango_pm_ops = {
 	.valid = suspend_valid_only_mem,
 };
 
-static int __init tango_pm_init(void)
+void __init tango_pm_init(void)
 {
 	suspend_set_ops(&tango_pm_ops);
-	return 0;
 }
-
-late_initcall(tango_pm_init);
diff --git a/arch/arm/mach-tango/pm.h b/arch/arm/mach-tango/pm.h
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifdef CONFIG_SUSPEND
+void __init tango_pm_init(void);
+#else
+#define tango_pm_init NULL
+#endif
diff --git a/arch/arm/mach-tango/setup.c b/arch/arm/mach-tango/setup.c
@@ -2,6 +2,7 @@
 #include <asm/mach/arch.h>
 #include <asm/hardware/cache-l2x0.h>
 #include "smc.h"
+#include "pm.h"
 
 static void tango_l2c_write(unsigned long val, unsigned int reg)
 {
@@ -15,4 +16,5 @@ DT_MACHINE_START(TANGO_DT, "Sigma Tango DT")
 	.dt_compat	= tango_dt_compat,
 	.l2c_aux_mask	= ~0,
 	.l2c_write_sec	= tango_l2c_write,
+	.init_late	= tango_pm_init,
 MACHINE_END

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#include <linux/suspend.h>`
`4`	`4`	`#include <asm/suspend.h>`
`5`	`5`	`#include "smc.h"`
	`6`	`+#include "pm.h"`
`6`	`7`
`7`	`8`	`static int tango_pm_powerdown(unsigned long arg)`
`8`	`9`	`{`
`@@ -24,10 +25,7 @@ static const struct platform_suspend_ops tango_pm_ops = {`
`24`	`25`	`.valid = suspend_valid_only_mem,`
`25`	`26`	`};`
`26`	`27`
`27`		`-static int __init tango_pm_init(void)`
	`28`	`+void __init tango_pm_init(void)`
`28`	`29`	`{`
`29`	`30`	`suspend_set_ops(&tango_pm_ops);`
`30`		`- return 0;`
`31`	`31`	`}`
`32`		`-`
`33`		`-late_initcall(tango_pm_init);`