Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-beck.git] / arch / arm / mach-omap2 / gpmc.c

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 1adb2d4496f6ffc095c1bc29fecad8c750ac6326..03d771349be6e058966bdfdcca35f28336e3eabf 100644 (file)
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -1348,11 +1348,9 @@ static int gpmc_probe(struct platform_device *pdev)
        phys_base = res->start;
        mem_size = resource_size(res);
 
-       gpmc_base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!gpmc_base) {
-               dev_err(&pdev->dev, "error: request memory / ioremap\n");
-               return -EADDRNOTAVAIL;
-       }
+       gpmc_base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(gpmc_base))
+               return PTR_ERR(gpmc_base);
 
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (res == NULL)