2013-04-30 05:00:36

by Jingoo Han

Subject: [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(-)

diff --git a/drivers/watchdog/bcm63xx_wdt.c b/drivers/watchdog/bcm63xx_wdt.c
index b2b80d4..a14a58d 100644
--- a/drivers/watchdog/bcm63xx_wdt.c
+++ b/drivers/watchdog/bcm63xx_wdt.c
@@ -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;
}

--
1.7.2.5

2013-04-30 21:38:40

by Florian Fainelli

Subject: Re: [PATCH V2 2/7] watchdog: bcm63xx_wdt: use devm_ioremap_nocache()

Le mardi 30 avril 2013 07:00:33, Jingoo Han a ?crit :
> 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]>

2013-05-25 19:06:46

by Wim Van Sebroeck

Subject: Re: [PATCH V2 2/7] watchdog: bcm63xx_wdt: use devm_ioremap_nocache()

Hi Jingoo,

> 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.