power: reset: as3722-poweroff: Use devm_register_sys_off_handler(POWER_OFF)

Use device life-cycle managed register function to simplify probe and
exit paths.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240212162831.67838-16-afd@ti.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/reset/as3722-poweroff.c b/drivers/power/reset/as3722-poweroff.c
index ab3350ce2d6214416a211e3fe3cf11936164688f..bb26fa6fa67ca720e131bae4a5a7f178fc5c6d9c 100644 (file)
--- a/drivers/power/reset/as3722-poweroff.c
+++ b/drivers/power/reset/as3722-poweroff.c
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
+#include <linux/reboot.h>
 #include <linux/slab.h>
 
 struct as3722_poweroff {
@@ -18,22 +19,18 @@ struct as3722_poweroff {
        struct as3722 *as3722;
 };
 
-static struct as3722_poweroff *as3722_pm_poweroff;
-
-static void as3722_pm_power_off(void)
+static int as3722_pm_power_off(struct sys_off_data *data)
 {
+       struct as3722_poweroff *as3722_pm_poweroff = data->cb_data;
        int ret;
 
-       if (!as3722_pm_poweroff) {
-               pr_err("AS3722 poweroff is not initialised\n");
-               return;
-       }
-
        ret = as3722_update_bits(as3722_pm_poweroff->as3722,
                AS3722_RESET_CONTROL_REG, AS3722_POWER_OFF, AS3722_POWER_OFF);
        if (ret < 0)
                dev_err(as3722_pm_poweroff->dev,
                        "RESET_CONTROL_REG update failed, %d\n", ret);
+
+       return NOTIFY_DONE;
 }
 
 static int as3722_poweroff_probe(struct platform_device *pdev)
@@ -54,18 +51,14 @@ static int as3722_poweroff_probe(struct platform_device *pdev)
 
        as3722_poweroff->as3722 = dev_get_drvdata(pdev->dev.parent);
        as3722_poweroff->dev = &pdev->dev;
-       as3722_pm_poweroff = as3722_poweroff;
-       if (!pm_power_off)
-               pm_power_off = as3722_pm_power_off;
 
-       return 0;
-}
+       return devm_register_sys_off_handler(as3722_poweroff->dev,
+                                            SYS_OFF_MODE_POWER_OFF,
+                                            SYS_OFF_PRIO_DEFAULT,
+                                            as3722_pm_power_off,
+                                            as3722_poweroff);
 
-static void as3722_poweroff_remove(struct platform_device *pdev)
-{
-       if (pm_power_off == as3722_pm_power_off)
-               pm_power_off = NULL;
-       as3722_pm_poweroff = NULL;
+       return 0;
 }
 
 static struct platform_driver as3722_poweroff_driver = {
@@ -73,7 +66,6 @@ static struct platform_driver as3722_poweroff_driver = {
                .name = "as3722-power-off",
        },
        .probe = as3722_poweroff_probe,
-       .remove_new = as3722_poweroff_remove,
 };
 
 module_platform_driver(as3722_poweroff_driver);