]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
xtensa: xtfpga: Use register_sys_off_handler(SYS_OFF_MODE_RESTART)
authorAndrew Davis <afd@ti.com>
Mon, 2 Mar 2026 19:35:43 +0000 (13:35 -0600)
committerMax Filippov <jcmvbkbc@gmail.com>
Tue, 3 Mar 2026 20:03:10 +0000 (12:03 -0800)
Function register_restart_handler() is deprecated. Using this new API
removes our need to keep and manage a struct notifier_block.

Signed-off-by: Andrew Davis <afd@ti.com>
Message-ID: <20260302193543.275197-3-afd@ti.com>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
arch/xtensa/platforms/xtfpga/setup.c

index a2432f0817101005d6cf995ce1cc5217d403bb57..67d7f37f1802e0c9716b9a76214bbac073bbd088 100644 (file)
@@ -42,8 +42,7 @@ static int xtfpga_power_off(struct sys_off_data *unused)
        return NOTIFY_DONE;
 }
 
-static int xtfpga_restart(struct notifier_block *this,
-                         unsigned long event, void *ptr)
+static int xtfpga_restart(struct sys_off_data *unused)
 {
        /* Try software reset first. */
        WRITE_ONCE(*(u32 *)XTFPGA_SWRST_VADDR, 0xdead);
@@ -56,10 +55,6 @@ static int xtfpga_restart(struct notifier_block *this,
        return NOTIFY_DONE;
 }
 
-static struct notifier_block xtfpga_restart_block = {
-       .notifier_call = xtfpga_restart,
-};
-
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 
 void __init platform_calibrate_ccount(void)
@@ -71,7 +66,9 @@ void __init platform_calibrate_ccount(void)
 
 static void __init xtfpga_register_handlers(void)
 {
-       register_restart_handler(&xtfpga_restart_block);
+       register_sys_off_handler(SYS_OFF_MODE_RESTART,
+                                SYS_OFF_PRIO_PLATFORM,
+                                xtfpga_restart, NULL);
        register_sys_off_handler(SYS_OFF_MODE_POWER_OFF,
                                 SYS_OFF_PRIO_DEFAULT,
                                 xtfpga_power_off, NULL);