watchdog: Convert to devm_ioremap_resource()

[karo-tx-linux.git] / drivers / watchdog / lantiq_wdt.c

diff --git a/drivers/watchdog/lantiq_wdt.c b/drivers/watchdog/lantiq_wdt.c
index 79fe01b423397f8dbd863b40ee3a7c2c6c3e8bb7..088fd0c9d88811e81dfab7217d612ec950654d69 100644 (file)
--- a/drivers/watchdog/lantiq_wdt.c
+++ b/drivers/watchdog/lantiq_wdt.c
@@ -197,11 +197,9 @@ ltq_wdt_probe(struct platform_device *pdev)
                return -ENOENT;
        }
 
-       ltq_wdt_membase = devm_request_and_ioremap(&pdev->dev, res);
-       if (!ltq_wdt_membase) {
-               dev_err(&pdev->dev, "cannot remap I/O memory region\n");
-               return -ENOMEM;
-       }
+       ltq_wdt_membase = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(ltq_wdt_membase))
+               return PTR_ERR(ltq_wdt_membase);
 
        /* we do not need to enable the clock as it is always running */
        clk = clk_get_io();