Skip to content

Commit 3ba0917

Browse files
committed
Revert "ODROID-N1: rk3399-restart: Register with kernel restart handler"
This reverts commit e7abf32.
1 parent a527959 commit 3ba0917

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

drivers/power/reset/rk3399-restart.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ struct rk3399_restart {
2828
};
2929
struct rk3399_restart *rk3399_restart;
3030

31-
static int rk3399_reboot(struct notifier_block *nb, unsigned long action,
32-
void *data)
31+
static void rk3399_reboot(enum reboot_mode reboot_mode, const char *cmd)
3332
{
3433
if (IS_ERR(rk3399_restart->reset_gpio)) {
35-
return NOTIFY_DONE;
34+
return;
3635
}
3736
/* drive it active, also inactive->active edge */
3837
gpiod_direction_output(rk3399_restart->reset_gpio, 1);
@@ -50,14 +49,9 @@ static int rk3399_reboot(struct notifier_block *nb, unsigned long action,
5049

5150
WARN_ON(1);
5251

53-
return NOTIFY_DONE;
52+
return;
5453
}
5554

56-
static struct notifier_block rk3399_reboot_nb = {
57-
.notifier_call = rk3399_reboot,
58-
.priority = 129,
59-
};
60-
6155
static int rk3399_restart_probe(struct platform_device *pdev)
6256
{
6357
bool open_source = false;
@@ -89,7 +83,7 @@ static int rk3399_restart_probe(struct platform_device *pdev)
8983

9084
platform_set_drvdata(pdev, rk3399_restart);
9185

92-
register_restart_handler(&rk3399_reboot_nb);
86+
arm_pm_restart = rk3399_reboot;
9387

9488
system_rev = 0x0301;
9589

0 commit comments

Comments
 (0)