| Message ID | 20240610142836.168603-4-afd@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] power: reset: brcmstb: Use normal driver register function | expand |
On Jun 10, 2024 at 09:28:35 -0500, Andrew Davis wrote: > 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> > --- > drivers/power/reset/brcmstb-reboot.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/drivers/power/reset/brcmstb-reboot.c b/drivers/power/reset/brcmstb-reboot.c > index 94ea317f61ef4..59ed1513cfb30 100644 > --- a/drivers/power/reset/brcmstb-reboot.c > +++ b/drivers/power/reset/brcmstb-reboot.c > @@ -29,8 +29,7 @@ struct reset_reg_mask { > > static const struct reset_reg_mask *reset_masks; > > -static int brcmstb_restart_handler(struct notifier_block *this, > - unsigned long mode, void *cmd) > +static int brcmstb_restart_handler(struct sys_off_data *data) > { > int rc; > u32 tmp; > @@ -65,11 +64,6 @@ static int brcmstb_restart_handler(struct notifier_block *this, > return NOTIFY_DONE; > } > > -static struct notifier_block brcmstb_restart_nb = { > - .notifier_call = brcmstb_restart_handler, > - .priority = 128, > -}; > - > static const struct reset_reg_mask reset_bits_40nm = { > .rst_src_en_mask = BIT(0), > .sw_mstr_rst_mask = BIT(0), > @@ -100,7 +94,8 @@ static int brcmstb_reboot_probe(struct platform_device *pdev) > rst_src_en = args[0]; > sw_mstr_rst = args[1]; > > - rc = register_restart_handler(&brcmstb_restart_nb); > + rc = devm_register_sys_off_handler(&pdev->dev, SYS_OFF_MODE_RESTART, > + 128, brcmstb_restart_handler, NULL); Reviewed-by: Dhruva Gole <d-gole@ti.com>
On 6/10/2024 3:28 PM, Andrew Davis wrote: > 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> Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>
diff --git a/drivers/power/reset/brcmstb-reboot.c b/drivers/power/reset/brcmstb-reboot.c index 94ea317f61ef4..59ed1513cfb30 100644 --- a/drivers/power/reset/brcmstb-reboot.c +++ b/drivers/power/reset/brcmstb-reboot.c @@ -29,8 +29,7 @@ struct reset_reg_mask { static const struct reset_reg_mask *reset_masks; -static int brcmstb_restart_handler(struct notifier_block *this, - unsigned long mode, void *cmd) +static int brcmstb_restart_handler(struct sys_off_data *data) { int rc; u32 tmp; @@ -65,11 +64,6 @@ static int brcmstb_restart_handler(struct notifier_block *this, return NOTIFY_DONE; } -static struct notifier_block brcmstb_restart_nb = { - .notifier_call = brcmstb_restart_handler, - .priority = 128, -}; - static const struct reset_reg_mask reset_bits_40nm = { .rst_src_en_mask = BIT(0), .sw_mstr_rst_mask = BIT(0), @@ -100,7 +94,8 @@ static int brcmstb_reboot_probe(struct platform_device *pdev) rst_src_en = args[0]; sw_mstr_rst = args[1]; - rc = register_restart_handler(&brcmstb_restart_nb); + rc = devm_register_sys_off_handler(&pdev->dev, SYS_OFF_MODE_RESTART, + 128, brcmstb_restart_handler, NULL); if (rc) dev_err(&pdev->dev, "cannot register restart handler (err=%d)\n", rc);
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> --- drivers/power/reset/brcmstb-reboot.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)