[RFC 2/3] kernel: Wire up system power framework
From: Thierry Reding <hidden>
Date: 2017-01-30 17:15:18
Also in:
lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Thierry Reding <redacted> Instead of relying on the globally defined pm_power_off_prepare() and pm_power_off() function pointers, use the equivalent global functions from the system-power framework. The system-power framework implements a fallback that relies on these global functions in case no system power chips have been registered. Signed-off-by: Thierry Reding <redacted> --- kernel/reboot.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/kernel/reboot.c b/kernel/reboot.c
index bd30a973fe94..ea075e285832 100644
--- a/kernel/reboot.c
+++ b/kernel/reboot.c@@ -15,6 +15,7 @@ #include <linux/suspend.h> #include <linux/syscalls.h> #include <linux/syscore_ops.h> +#include <linux/system-power.h> #include <linux/uaccess.h> /*
@@ -257,8 +258,7 @@ EXPORT_SYMBOL_GPL(kernel_halt); void kernel_power_off(void) { kernel_shutdown_prepare(SYSTEM_POWER_OFF); - if (pm_power_off_prepare) - pm_power_off_prepare(); + system_power_off_prepare(); migrate_to_reboot_cpu(); syscore_shutdown(); pr_emerg("Power down\n");
@@ -305,10 +305,11 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd, if (ret) return ret; - /* Instead of trying to make the power_off code look like - * halt when pm_power_off is not set do it the easy way. + /* + * Instead of trying to make the power_off code look like halt when + * power off is not supported do it the easy way. */ - if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) + if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !system_can_power_off()) cmd = LINUX_REBOOT_CMD_HALT; mutex_lock(&reboot_mutex);
--
2.11.0