watchdog: Convert to devm_ioremap_resource()

Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.

devm_ioremap_resource() provides its own error messages; so all explicit
error messages can be removed from the failure code paths.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

4 files changed, 14 insertions, 17 deletions

diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c
index 898799074a13..d184c48a0482 100644
--- a/drivers/watchdog/ath79_wdt.c
+++ b/drivers/watchdog/ath79_wdt.c
@@ -253,11 +253,9 @@ static int ath79_wdt_probe(struct platform_device *pdev)
                 return -EINVAL;
         }
 
-        wdt_base = devm_request_and_ioremap(&pdev->dev, res);
-        if (!wdt_base) {
-                dev_err(&pdev->dev, "unable to remap memory region\n");
-                return -ENOMEM;
-        }
+        wdt_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(wdt_base))
+                return PTR_ERR(wdt_base);
 
         wdt_clk = devm_clk_get(&pdev->dev, "wdt");
         if (IS_ERR(wdt_clk))
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index 7df1fdca9e78..100d4fbfde2a 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -27,6 +27,7 @@
 #include <linux/device.h>
 #include <linux/clk.h>
 #include <linux/slab.h>
+#include <linux/err.h>
 
 #define MODULE_NAME "DAVINCI-WDT: "
 
@@ -221,11 +222,9 @@ static int davinci_wdt_probe(struct platform_device *pdev)
                 return -ENOENT;
         }
 
-        wdt_base = devm_request_and_ioremap(dev, wdt_mem);
-        if (!wdt_base) {
-                dev_err(dev, "ioremap failed\n");
-                return -EADDRNOTAVAIL;
-        }
+        wdt_base = devm_ioremap_resource(dev, wdt_mem);
+        if (IS_ERR(wdt_base))
+                return PTR_ERR(wdt_base);
 
         ret = misc_register(&davinci_wdt_miscdev);
         if (ret < 0) {
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index c1a221cbeae4..ee03135f5abd 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -330,10 +330,9 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
         }
 
         /* get the memory region for the watchdog timer */
-        wdt_base = devm_request_and_ioremap(dev, wdt_mem);
-        if (wdt_base == NULL) {
-                dev_err(dev, "failed to devm_request_and_ioremap() region\n");
-                ret = -ENOMEM;
+        wdt_base = devm_ioremap_resource(dev, wdt_mem);
+        if (IS_ERR(wdt_base)) {
+                ret = PTR_ERR(wdt_base);
                 goto err;
         }
 
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index 6a89e4045fbd..6185af2b3310 100644
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/clk.h>
+#include <linux/err.h>
 #include <asm/watchdog.h>
 
 #define DRV_NAME "sh-wdt"
@@ -249,9 +250,9 @@ static int sh_wdt_probe(struct platform_device *pdev)
                 wdt->clk = NULL;
         }
 
-        wdt->base = devm_request_and_ioremap(wdt->dev, res);
-        if (unlikely(!wdt->base)) {
-                rc = -EADDRNOTAVAIL;
+        wdt->base = devm_ioremap_resource(wdt->dev, res);
+        if (IS_ERR(wdt->base)) {
+                rc = PTR_ERR(wdt->base);
                 goto err;
         }