]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
watchdog: ep93xx_wdt: Use devm_ioremap_resource()
authorJingoo Han <jg1.han@samsung.com>
Tue, 11 Feb 2014 12:41:54 +0000 (21:41 +0900)
committerWim Van Sebroeck <wim@iguana.be>
Mon, 31 Mar 2014 11:24:14 +0000 (13:24 +0200)
Use devm_ioremap_resource() in order to make the code simpler,
and remove redundant return value check of platform_get_resource()
because the value is checked by devm_ioremap_resource().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/ep93xx_wdt.c

index d1d07f2f69df7cf61cd838feaa89650c22908098..5e4f3dea85f5b8df8f62f305d84e5ecf441999b9 100644 (file)
@@ -118,16 +118,9 @@ static int ep93xx_wdt_probe(struct platform_device *pdev)
        int err;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res)
-               return -ENXIO;
-
-       if (!devm_request_mem_region(&pdev->dev, res->start,
-                                    resource_size(res), pdev->name))
-               return -EBUSY;
-
-       mmio_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
-       if (!mmio_base)
-               return -ENXIO;
+       mmio_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(mmio_base))
+               return PTR_ERR(mmio_base);
 
        if (timeout < 1 || timeout > 3600) {
                timeout = WDT_TIMEOUT;