[PATCH v7 02/11] power/restart: Call machine_restart instead of arm_pm_restart
From: linux@roeck-us.net (Guenter Roeck)
Date: 2014-08-20 00:46:01
Also in:
linux-pm, linux-samsung-soc, linux-watchdog, lkml
Subsystem:
system reset/shutdown drivers, the rest · Maintainers:
Sebastian Reichel, Linus Torvalds
machine_restart is supported on non-ARM platforms, and and ultimately calls arm_pm_restart, so dont call arm_pm_restart directly but use the more generic function. Cc: Russell King <redacted> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Heiko Stuebner <heiko@sntech.de> --- v7: No change. v6: No change. v5: No change. v4: No change. v3: No change. v2: Added patch. drivers/power/reset/restart-poweroff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c
index 3e51f8d..edd707e 100644
--- a/drivers/power/reset/restart-poweroff.c
+++ b/drivers/power/reset/restart-poweroff.c@@ -20,7 +20,8 @@ static void restart_poweroff_do_poweroff(void) { - arm_pm_restart(REBOOT_HARD, NULL); + reboot_mode = REBOOT_HARD; + machine_restart(NULL); } static int restart_poweroff_probe(struct platform_device *pdev)
--
1.9.1