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>

1 files changed, 3 insertions, 4 deletions

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;
         }