watchdog: Convert to devm_ioremap_resource()

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

diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index a61408fa0c94721a8481b446cd5cae9a55d76021..1cb25f69a96dbff9b4c93b0e3eceab93798c8146 100644 (file)
--- 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;
        }