From 3ba0917936e66d28992af36aa63dbaaba2d69b88 Mon Sep 17 00:00:00 2001 From: scpcom Date: Fri, 19 Aug 2022 23:31:37 +0200 Subject: [PATCH] Revert "ODROID-N1: rk3399-restart: Register with kernel restart handler" This reverts commit e7abf321bbe98323d57548f9d5787f4fdea57a22. --- drivers/power/reset/rk3399-restart.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/power/reset/rk3399-restart.c b/drivers/power/reset/rk3399-restart.c index 7b1e273ff23b5..cf5bacec2d06b 100755 --- a/drivers/power/reset/rk3399-restart.c +++ b/drivers/power/reset/rk3399-restart.c @@ -28,11 +28,10 @@ struct rk3399_restart { }; struct rk3399_restart *rk3399_restart; -static int rk3399_reboot(struct notifier_block *nb, unsigned long action, - void *data) +static void rk3399_reboot(enum reboot_mode reboot_mode, const char *cmd) { if (IS_ERR(rk3399_restart->reset_gpio)) { - return NOTIFY_DONE; + return; } /* drive it active, also inactive->active edge */ gpiod_direction_output(rk3399_restart->reset_gpio, 1); @@ -50,14 +49,9 @@ static int rk3399_reboot(struct notifier_block *nb, unsigned long action, WARN_ON(1); - return NOTIFY_DONE; + return; } -static struct notifier_block rk3399_reboot_nb = { - .notifier_call = rk3399_reboot, - .priority = 129, -}; - static int rk3399_restart_probe(struct platform_device *pdev) { bool open_source = false; @@ -89,7 +83,7 @@ static int rk3399_restart_probe(struct platform_device *pdev) platform_set_drvdata(pdev, rk3399_restart); - register_restart_handler(&rk3399_reboot_nb); + arm_pm_restart = rk3399_reboot; system_rev = 0x0301;