Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
reset: npcm: Use devm_register_sys_off_handler()
Function register_restart_handler() is deprecated. Using this new API
removes our need to keep and manage a struct notifier_block and to
later unregister the handler.
Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
authored by
Andrew Davis
and committed by
Philipp Zabel
71c021cd
42d03696
+4
-8
+4
-8
drivers/reset/reset-npcm.c
+4
-8
drivers/reset/reset-npcm.c
···
89
89
90
90
struct npcm_rc_data {
91
91
struct reset_controller_dev rcdev;
92
-
struct notifier_block restart_nb;
93
92
const struct npcm_reset_info *info;
94
93
struct regmap *gcr_regmap;
95
94
u32 sw_reset_number;
···
99
100
100
101
#define to_rc_data(p) container_of(p, struct npcm_rc_data, rcdev)
101
102
102
-
static int npcm_rc_restart(struct notifier_block *nb, unsigned long mode,
103
-
void *cmd)
103
+
static int npcm_rc_restart(struct sys_off_data *data)
104
104
{
105
-
struct npcm_rc_data *rc = container_of(nb, struct npcm_rc_data,
106
-
restart_nb);
105
+
struct npcm_rc_data *rc = data->cb_data;
107
106
108
107
writel(NPCM_SWRST << rc->sw_reset_number, rc->base + NPCM_SWRSTR);
109
108
mdelay(1000);
···
469
472
if (!of_property_read_u32(pdev->dev.of_node, "nuvoton,sw-reset-number",
470
473
&rc->sw_reset_number)) {
471
474
if (rc->sw_reset_number && rc->sw_reset_number < 5) {
472
-
rc->restart_nb.priority = 192;
473
-
rc->restart_nb.notifier_call = npcm_rc_restart;
474
-
ret = register_restart_handler(&rc->restart_nb);
475
+
ret = devm_register_sys_off_handler(&pdev->dev, SYS_OFF_MODE_RESTART, 192,
476
+
npcm_rc_restart, rc);
475
477
if (ret) {
476
478
dev_warn(&pdev->dev, "failed to register restart handler\n");
477
479
return ret;