watchdog: Convert to devm_ioremap_resource()

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

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index bc17decc855177818dae5d1748bfb0ac572ed040..ff908823688cf969e5fd420141827f0cc9a91a39 100644 (file)
--- 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)) {