Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
reset: ma35d1: 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
42d03696
09f16612
+4
-7
+4
-7
drivers/reset/reset-ma35d1.c
+4
-7
drivers/reset/reset-ma35d1.c
···
19
19
20
20
struct ma35d1_reset_data {
21
21
struct reset_controller_dev rcdev;
22
-
struct notifier_block restart_handler;
23
22
void __iomem *base;
24
23
/* protect registers against concurrent read-modify-write */
25
24
spinlock_t lock;
···
124
125
[MA35D1_RESET_SSPCC] = {0x2C, 31}
125
126
};
126
127
127
-
static int ma35d1_restart_handler(struct notifier_block *this, unsigned long mode, void *cmd)
128
+
static int ma35d1_restart_handler(struct sys_off_data *sys_off_data)
128
129
{
129
-
struct ma35d1_reset_data *data =
130
-
container_of(this, struct ma35d1_reset_data, restart_handler);
130
+
struct ma35d1_reset_data *data = sys_off_data->cb_data;
131
131
u32 id = MA35D1_RESET_CHIP;
132
132
133
133
writel_relaxed(BIT(ma35d1_reset_map[id].bit),
···
211
213
reset_data->rcdev.nr_resets = MA35D1_RESET_COUNT;
212
214
reset_data->rcdev.ops = &ma35d1_reset_ops;
213
215
reset_data->rcdev.of_node = dev->of_node;
214
-
reset_data->restart_handler.notifier_call = ma35d1_restart_handler;
215
-
reset_data->restart_handler.priority = 192;
216
216
spin_lock_init(&reset_data->lock);
217
217
218
-
err = register_restart_handler(&reset_data->restart_handler);
218
+
err = devm_register_sys_off_handler(dev, SYS_OFF_MODE_RESTART, 192,
219
+
ma35d1_restart_handler, reset_data);
219
220
if (err)
220
221
dev_warn(&pdev->dev, "failed to register restart handler\n");
221
222