watchdog: at32ap700x_wdt: use devm_*() functions
PATCH RESEND 1/7 watchdog: at32ap700x_wdt: use devm_*() functions
Use devm_*() functions to make cleanup paths simpler.
Signed-off-by Jingoo Han <[email protected]>
--- drivers/watchdog/at32ap700x_wdt.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-)
drivers/watchdog/at32ap700x_wdt.c +4 -8
@@ -321,13 +321,14 @@ static int __init at32_wdt_probe(struct platform_device *pdev)return -ENXIO ; } - wdt =kzalloc (sizeof (struct wdt_at32ap700x ),GFP_KERNEL ); + wdt =devm_kzalloc (&pdev->dev,sizeof (struct wdt_at32ap700x ), +GFP_KERNEL );if (!wdt) {dev_dbg (&pdev->dev,"no memory for wdt structure\n" );return -ENOMEM ; } - wdt->regs =ioremap (regs->start,resource_size (regs)); + wdt->regs =devm_ioremap (&pdev->dev, regs->start,resource_size (regs));if (!wdt->regs) { ret = -ENOMEM ;dev_dbg (&pdev->dev,"could not map I/O memory\n" );
@@ -342,7 +343,7 @@ static int __init at32_wdt_probe(struct platform_device *pdev)dev_info (&pdev->dev,"CPU must be reset with external " "reset or POR due to silicon errata.\n" ); ret = -EIO ; - goto err_iounmap; + goto err_free; }else { wdt->users =0 ; }
@@ -375,10 +376,7 @@ static int __init at32_wdt_probe(struct platform_device *pdev) err_register:platform_set_drvdata (pdev,NULL ); -err_iounmap: -iounmap (wdt->regs); err_free: -kfree (wdt); wdt =NULL ;return ret; }
@@ -391,8 +389,6 @@ static int __exit at32_wdt_remove(struct platform_device *pdev)at32_wdt_stop ();misc_deregister (&wdt->miscdev); -iounmap (wdt->regs); -kfree (wdt); wdt =NULL ;platform_set_drvdata (pdev,NULL ); }
Signature · 1 line
1.7.2.5
Quoted 49 lines · Jingoo Han
Use devm_*() functions to make cleanup paths simpler.
Signed-off-by Jingoo Han <[email protected]>--- drivers/watchdog/at32ap700x_wdt.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-)drivers/watchdog/at32ap700x_wdt.c +4
-6@@ -321,13 +321,14 @@ static int __init at32_wdt_probe(struct platform_device *pdev)return -ENXIO ; } - wdt =kzalloc (sizeof (struct wdt_at32ap700x ),GFP_KERNEL ); + wdt =devm_kzalloc (&pdev->dev,sizeof (struct wdt_at32ap700x ), +GFP_KERNEL );if (!wdt) {dev_dbg (&pdev->dev,"no memory for wdt structure\n" );return -ENOMEM ; } - wdt->regs =ioremap (regs->start,resource_size (regs)); + wdt->regs =devm_ioremap (&pdev->dev, regs->start,resource_size (regs));if (!wdt->regs) { ret = -ENOMEM ;dev_dbg (&pdev->dev,"could not map I/O memory\n" );@@ -342,7 +343,7 @@ static int __init at32_wdt_probe(struct platform_device *pdev)dev_info (&pdev->dev,"CPU must be reset with external " "reset or POR due to silicon errata.\n" ); ret = -EIO ; - goto err_iounmap; + goto err_free; }else { wdt->users =0 ; }@@ -375,10 +376,7 @@ static int __init at32_wdt_probe(struct platform_device *pdev) err_register:platform_set_drvdata (pdev,NULL ); -err_iounmap: -iounmap (wdt->regs); err_free: -kfree (wdt); wdt =NULL ;return ret; }
drivers/watchdog/at32ap700x_wdt.c static int __exit at32_wdt_remove(struct platform_device *pdev) · line 394
Quoted 8 lines
drivers/watchdog/at32ap700x_wdt.c +0
-2@@ -391,8 +389,6 @@ static int __exit at32_wdt_remove(struct platform_device *pdev)at32_wdt_stop ();misc_deregister (&wdt->miscdev); -iounmap (wdt->regs); -kfree (wdt); wdt =NULL ;platform_set_drvdata (pdev,NULL ); }
err_free isn't really appropriate anymore as label,
and platform_set_drvdata(pdev, NULL) as well as the associated complexity in at32_wdt_remove is not really needed, but especially the latter should really be addressed in another patch, so
Acked-by Guenter Roeck <[email protected]>