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/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
index 3003e2a9580b..2f3cc8fb471a 100644
--- a/drivers/watchdog/ar7_wdt.c
+++ b/drivers/watchdog/ar7_wdt.c
@@ -285,11 +285,9 @@ static int ar7_wdt_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
 
-        ar7_wdt = devm_request_and_ioremap(&pdev->dev, ar7_regs_wdt);
-        if (!ar7_wdt) {
-                pr_err("could not ioremap registers\n");
-                return -ENXIO;
-        }
+        ar7_wdt = devm_ioremap_resource(&pdev->dev, ar7_regs_wdt);
+        if (IS_ERR(ar7_wdt))
+                return PTR_ERR(ar7_wdt);
 
         vbus_clk = clk_get(NULL, "vbus");
         if (IS_ERR(vbus_clk)) {