gpio_msm: Convert to use devm_ioremap_resource

Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()")
introduced devm_ioremap_resource() and deprecated the use of
devm_request_and_ioremap().

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: linux-gpio@vger.kernel.org
CC: Linus Walleij <linus.walleij@linaro.org>
CC: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-msm-v1.c b/drivers/gpio/gpio-msm-v1.c
index fb2cc90d013423ce15fe34c550493cd329ebb26d..e3ceaacde45c111990c534c887a47cda3a5ec61e 100644 (file)
--- a/drivers/gpio/gpio-msm-v1.c
+++ b/drivers/gpio/gpio-msm-v1.c
@@ -652,14 +652,14 @@ static int gpio_msm_v1_probe(struct platform_device *pdev)
                return irq2;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       base1 = devm_request_and_ioremap(&pdev->dev, res);
-       if (!base1)
-               return -EADDRNOTAVAIL;
+       base1 = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(base1))
+               return PTR_ERR(base1);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       base2 = devm_request_and_ioremap(&pdev->dev, res);
-       if (!base2)
-               return -EADDRNOTAVAIL;
+       base2 = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(base2))
+               return PTR_ERR(base2);
 
        for (i = FIRST_GPIO_IRQ; i < FIRST_GPIO_IRQ + NR_GPIO_IRQS; i++) {
                if (i - FIRST_GPIO_IRQ >=