watchdog: Convert to devm_ioremap_resource()

Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() 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: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index bc17decc8551..ff908823688c 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -262,11 +262,9 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        imx2_wdt.base = devm_request_and_ioremap(&pdev->dev, res);
-        if (!imx2_wdt.base) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                return -ENOMEM;
-        }
+        imx2_wdt.base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(imx2_wdt.base))
+                return PTR_ERR(imx2_wdt.base);
 
         imx2_wdt.clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(imx2_wdt.clk)) {