watchdog: Convert to devm_ioremap_resource()

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

diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index dcba5dab6c299b3111ad528ba1f42e8a283dee07..de1f3fa1d78771341242a65a386089a13f72bc7a 100644 (file)
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -155,9 +155,9 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)
                heartbeat = DEFAULT_HEARTBEAT;
 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       wdt_base = devm_request_and_ioremap(&pdev->dev, r);
-       if (!wdt_base)
-               return -EADDRINUSE;
+       wdt_base = devm_ioremap_resource(&pdev->dev, r);
+       if (IS_ERR(wdt_base))
+               return PTR_ERR(wdt_base);
 
        wdt_clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(wdt_clk))