watchdog: bcm63xx_wdt: use devm_ioremap_nocache()
PATCH v2 2/7 watchdog: bcm63xx_wdt: use devm_ioremap_nocache()
Use devm_ioremap_nocache() to make cleanup paths simpler.
Reviewed-by Guenter Roeck <[email protected]>
Signed-off-by Jingoo Han <[email protected]>
---
No changes since v1:
drivers/watchdog/bcm63xx_wdt.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
drivers/watchdog/bcm63xx_wdt.c +4 -5
@@ -16,6 +16,7 @@#include <linux/errno.h> #include <linux/fs.h> #include <linux/init.h> +#include <linux/io.h> #include <linux/kernel.h> #include <linux/miscdevice.h> #include <linux/module.h>
@@ -249,7 +250,8 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev)return -ENODEV ; } - bcm63xx_wdt_device.regs =ioremap_nocache (r->start,resource_size (r)); + bcm63xx_wdt_device.regs =devm_ioremap_nocache (&pdev->dev, r->start, +resource_size (r));if (!bcm63xx_wdt_device.regs) {dev_err (&pdev->dev,"failed to remap I/O resources\n" );return -ENXIO ;
@@ -258,7 +260,7 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) ret =bcm63xx_timer_register (TIMER_WDT_ID , bcm63xx_wdt_isr,NULL );if (ret <0 ) {dev_err (&pdev->dev,"failed to register wdt timer isr\n" ); - goto unmap; +return ret; }if (bcm63xx_wdt_settimeout (wdt_time)) {
@@ -281,8 +283,6 @@ static int bcm63xx_wdt_probe(struct platform_device *pdev) unregister_timer:bcm63xx_timer_unregister (TIMER_WDT_ID ); -unmap: -iounmap (bcm63xx_wdt_device.regs);return ret; }
@@ -293,7 +293,6 @@ static int bcm63xx_wdt_remove(struct platform_device *pdev)misc_deregister (&bcm63xx_wdt_miscdev);bcm63xx_timer_unregister (TIMER_WDT_ID ); -iounmap (bcm63xx_wdt_device.regs);return 0 ; }
Signature · 1 line
1.7.2.5
Quoted 4 lines · Jingoo Han
Use
devm_ioremap_nocache()to make cleanup paths simpler.Reviewed-by Guenter Roeck <[email protected]>Signed-off-by Jingoo Han <[email protected]>
Acked-by Florian Fainelli <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Jingoo,
Quoted 9 lines
Use
devm_ioremap_nocache()to make cleanup paths simpler.Reviewed-by Guenter Roeck <[email protected]>Signed-off-by Jingoo Han <[email protected]>---
No changes since v1:drivers/watchdog/bcm63xx_wdt.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
Patch added to linux-watchdog-next.
Kind regards,
Wim.