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, 5 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))