Skip to content

Commit

Permalink
power/restart: call machine_restart instead of arm_pm_restart
Browse files Browse the repository at this point in the history
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.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jonas Jensen <jonas.jensen@gmail.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Guenter Roeck committed Sep 26, 2014
1 parent b63adb9 commit 0713e14
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/power/reset/restart-poweroff.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0713e14

Please sign in to comment.