superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drivers/soc/litex: Use devm_register_restart_handler() 

Use device life-cycle managed register function to simplify probe error
path and eliminate need for explicit remove function.

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Gabriel Somlo <gsomlo@gmail.com>
Link: https://lore.kernel.org/all/20240123164443.394642-3-afd@ti.com
Signed-off-by: Gabriel Somlo <gsomlo@gmail.com>
pull/1134/head
Andrew Davis 2024-01-23 10:44:41 -06:00 committed by Gabriel Somlo
parent 40384c840e
commit c7345869aa
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/soc/litex/litex_soc_ctrl.c
View File

@ -69,14 +69,11 @@ static int litex_check_csr_access(void __iomem *reg_addr)
struct litex_soc_ctrl_device { struct litex_soc_ctrl_device {
void __iomem *base; void __iomem *base;
struct notifier_block reset_nb;
}; };
static int litex_reset_handler(struct notifier_block *this, unsigned long mode, static int litex_reset_handler(struct sys_off_data *data)
void *cmd)
{ {
struct litex_soc_ctrl_device *soc_ctrl_dev = struct litex_soc_ctrl_device *soc_ctrl_dev = data->cb_data;
container_of(this, struct litex_soc_ctrl_device, reset_nb);
litex_write32(soc_ctrl_dev->base + RESET_REG_OFF, RESET_REG_VALUE); litex_write32(soc_ctrl_dev->base + RESET_REG_OFF, RESET_REG_VALUE);
return NOTIFY_DONE; return NOTIFY_DONE;
@ -105,11 +102,9 @@ static int litex_soc_ctrl_probe(struct platform_device *pdev)
if (error) if (error)
return error; return error;
platform_set_drvdata(pdev, soc_ctrl_dev); error = devm_register_restart_handler(&pdev->dev,
litex_reset_handler,
soc_ctrl_dev->reset_nb.notifier_call = litex_reset_handler; soc_ctrl_dev);
soc_ctrl_dev->reset_nb.priority = 128;
error = register_restart_handler(&soc_ctrl_dev->reset_nb);
if (error) { if (error) {
dev_warn(&pdev->dev, "cannot register restart handler: %d\n", dev_warn(&pdev->dev, "cannot register restart handler: %d\n",
error); error);
@ -118,20 +113,12 @@ static int litex_soc_ctrl_probe(struct platform_device *pdev)
return 0; return 0;
} }
static void litex_soc_ctrl_remove(struct platform_device *pdev)
{
struct litex_soc_ctrl_device *soc_ctrl_dev = platform_get_drvdata(pdev);
unregister_restart_handler(&soc_ctrl_dev->reset_nb);
}
static struct platform_driver litex_soc_ctrl_driver = { static struct platform_driver litex_soc_ctrl_driver = {
.driver = { .driver = {
.name = "litex-soc-controller", .name = "litex-soc-controller",
.of_match_table = litex_soc_ctrl_of_match, .of_match_table = litex_soc_ctrl_of_match,
}, },
.probe = litex_soc_ctrl_probe, .probe = litex_soc_ctrl_probe,
.remove = litex_soc_ctrl_remove,
}; };
module_platform_driver(litex_soc_ctrl_driver); module_platform_driver(litex_soc_ctrl_driver);