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, 3 deletions

diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index a61408fa0c94..1cb25f69a96d 100644
--- a/drivers/watchdog/jz4740_wdt.c
+++ b/drivers/watchdog/jz4740_wdt.c
@@ -171,9 +171,9 @@ static int jz4740_wdt_probe(struct platform_device *pdev)
         watchdog_set_drvdata(jz4740_wdt, drvdata);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        drvdata->base = devm_request_and_ioremap(&pdev->dev, res);
-        if (drvdata->base == NULL) {
-                ret = -EBUSY;
+        drvdata->base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(drvdata->base)) {
+                ret = PTR_ERR(drvdata->base);
                 goto err_out;
         }