[RESEND PATCH v3 4/6] watchdog: omap_wdt: convert ioremap() to devm_ioremap()

[Aaro Koskinen]

Use devm_ioremap() to simplify the code.

Signed-off-by: Aaro Koskinen <aaro.koski...@iki.fi>
Cc: Wim Van Sebroeck <w...@iguana.be>
---
 drivers/watchdog/omap_wdt.c |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 45019b0..7e8d3e0 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -255,11 +255,9 @@ static int __devinit omap_wdt_probe(struct platform_device 
*pdev)
        wdev->wdt_trgr_pattern  = 0x1234;
        mutex_init(&wdev->lock);
 
-       wdev->base = ioremap(res->start, resource_size(res));
-       if (!wdev->base) {
-               ret = -ENOMEM;
-               goto err_ioremap;
-       }
+       wdev->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
+       if (!wdev->base)
+               return -ENOMEM;
 
        platform_set_drvdata(pdev, omap_wdt);
 
@@ -283,10 +281,6 @@ static int __devinit omap_wdt_probe(struct platform_device 
*pdev)
 err_misc:
        pm_runtime_disable(wdev->dev);
        platform_set_drvdata(pdev, NULL);
-       iounmap(wdev->base);
-
-err_ioremap:
-       wdev->base = NULL;
 
        return ret;
 }
@@ -314,8 +308,6 @@ static int __devexit omap_wdt_remove(struct platform_device 
*pdev)
        watchdog_unregister_device(wdog);
        platform_set_drvdata(pdev, NULL);
 
-       iounmap(wdev->base);
-
        return 0;
 }
 
-- 
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/