power: reset: tps65086-restart: Use devm_register_sys_off_handler(RESTART)

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-6-afd@ti.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/reset/tps65086-restart.c b/drivers/power/reset/tps65086-restart.c
index ee8e9f4b837eaee09f2224c6cda81cfe08f296f8..82d7a761a0385d20b094e23f9efe717a79ac3f6b 100644 (file)
--- a/drivers/power/reset/tps65086-restart.c
+++ b/drivers/power/reset/tps65086-restart.c
@@ -10,15 +10,12 @@
 #include <linux/reboot.h>
 
 struct tps65086_restart {
-       struct notifier_block handler;
        struct device *dev;
 };
 
-static int tps65086_restart_notify(struct notifier_block *this,
-                                  unsigned long mode, void *cmd)
+static int tps65086_restart_notify(struct sys_off_data *data)
 {
-       struct tps65086_restart *tps65086_restart =
-               container_of(this, struct tps65086_restart, handler);
+       struct tps65086_restart *tps65086_restart = data->cb_data;
        struct tps65086 *tps65086 = dev_get_drvdata(tps65086_restart->dev->parent);
        int ret;
 
@@ -46,13 +43,13 @@ static int tps65086_restart_probe(struct platform_device *pdev)
        if (!tps65086_restart)
                return -ENOMEM;
 
-       platform_set_drvdata(pdev, tps65086_restart);
-
-       tps65086_restart->handler.notifier_call = tps65086_restart_notify;
-       tps65086_restart->handler.priority = 192;
        tps65086_restart->dev = &pdev->dev;
 
-       ret = register_restart_handler(&tps65086_restart->handler);
+       ret = devm_register_sys_off_handler(&pdev->dev,
+                                           SYS_OFF_MODE_RESTART,
+                                           SYS_OFF_PRIO_HIGH,
+                                           tps65086_restart_notify,
+                                           tps65086_restart);
        if (ret) {
                dev_err(&pdev->dev, "%s: cannot register restart handler: %d\n",
                        __func__, ret);
@@ -62,23 +59,6 @@ static int tps65086_restart_probe(struct platform_device *pdev)
        return 0;
 }
 
-static void tps65086_restart_remove(struct platform_device *pdev)
-{
-       struct tps65086_restart *tps65086_restart = platform_get_drvdata(pdev);
-       int ret;
-
-       ret = unregister_restart_handler(&tps65086_restart->handler);
-       if (ret) {
-               /*
-                * tps65086_restart_probe() registered the restart handler. So
-                * unregistering should work fine. Checking the error code
-                * shouldn't be needed, still doing it for completeness.
-                */
-               dev_err(&pdev->dev, "%s: cannot unregister restart handler: %d\n",
-                       __func__, ret);
-       }
-}
-
 static const struct platform_device_id tps65086_restart_id_table[] = {
        { "tps65086-reset", },
        { /* sentinel */ }
@@ -90,7 +70,6 @@ static struct platform_driver tps65086_restart_driver = {
                .name = "tps65086-restart",
        },
        .probe = tps65086_restart_probe,
-       .remove_new = tps65086_restart_remove,
        .id_table = tps65086_restart_id_table,
 };
 module_platform_driver(tps65086_restart_driver);