[PATCH v2 23/45] ACPI: power: Switch to power-handler API

[Dmitry Osipenko <digetx@xxxxxxxxx>]

Switch to power-handler API that replaces legacy pm_power_off callbacks.

Signed-off-by: Dmitry Osipenko <digetx@xxxxxxxxx>
---
 drivers/acpi/sleep.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 3023224515ab..41b3ea867f8f 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -47,19 +47,11 @@ static void acpi_sleep_tts_switch(u32 acpi_state)
        }
 }
 
-static int tts_notify_reboot(struct notifier_block *this,
-                       unsigned long code, void *x)
+static void tts_reboot_prepare(struct reboot_prep_data *data)
 {
        acpi_sleep_tts_switch(ACPI_STATE_S5);
-       return NOTIFY_DONE;
 }
 
-static struct notifier_block tts_notifier = {
-       .notifier_call  = tts_notify_reboot,
-       .next           = NULL,
-       .priority       = 0,
-};
-
 static int acpi_sleep_prepare(u32 acpi_state)
 {
 #ifdef CONFIG_ACPI_SLEEP
@@ -1016,7 +1008,7 @@ static void acpi_sleep_hibernate_setup(void)
 static inline void acpi_sleep_hibernate_setup(void) {}
 #endif /* !CONFIG_HIBERNATION */
 
-static void acpi_power_off_prepare(void)
+static void acpi_power_off_prepare(struct power_off_prep_data *data)
 {
        /* Prepare to power off the system */
        acpi_sleep_prepare(ACPI_STATE_S5);
@@ -1024,7 +1016,7 @@ static void acpi_power_off_prepare(void)
        acpi_os_wait_events_complete();
 }
 
-static void acpi_power_off(void)
+static void acpi_power_off(struct power_off_data *data)
 {
        /* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
        pr_debug("%s called\n", __func__);
@@ -1032,6 +1024,11 @@ static void acpi_power_off(void)
        acpi_enter_sleep_state(ACPI_STATE_S5);
 }
 
+static struct power_handler acpi_power_handler = {
+       .power_off_priority = POWEROFF_PRIO_FIRMWARE,
+       .reboot_prepare_cb = tts_reboot_prepare,
+};
+
 int __init acpi_sleep_init(void)
 {
        char supported[ACPI_S_STATE_COUNT * 3 + 1];
@@ -1048,8 +1045,8 @@ int __init acpi_sleep_init(void)
 
        if (acpi_sleep_state_supported(ACPI_STATE_S5)) {
                sleep_states[ACPI_STATE_S5] = 1;
-               pm_power_off_prepare = acpi_power_off_prepare;
-               pm_power_off = acpi_power_off;
+               acpi_power_handler.power_off_cb = acpi_power_off;
+               acpi_power_handler.power_off_prepare_cb = 
acpi_power_off_prepare;
        } else {
                acpi_no_s5 = true;
        }
@@ -1065,6 +1062,6 @@ int __init acpi_sleep_init(void)
         * Register the tts_notifier to reboot notifier list so that the _TTS
         * object can also be evaluated when the system enters S5.
         */
-       register_reboot_notifier(&tts_notifier);
+       register_power_handler(&acpi_power_handler);
        return 0;
 }
-- 
2.33.1