Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

[~andy/linux] / drivers / gpio / gpio-spear-spics.c

diff --git a/drivers/gpio/gpio-spear-spics.c b/drivers/gpio/gpio-spear-spics.c
index 5f45fc4ed5d12ef1a86a4e6d0a3f276f6149eb5d..7a4bf7c0d98f266197f3d06fa069564f2028cbeb 100644 (file)
--- a/drivers/gpio/gpio-spear-spics.c
+++ b/drivers/gpio/gpio-spear-spics.c
@@ -140,11 +140,9 @@ static int spics_gpio_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       spics->base = devm_request_and_ioremap(&pdev->dev, res);
-       if (!spics->base) {
-               dev_err(&pdev->dev, "request and ioremap fail\n");
-               return -ENOMEM;
-       }
+       spics->base = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(spics->base))
+               return PTR_ERR(spics->base);
 
        if (of_property_read_u32(np, "st-spics,peripcfg-reg",
                                &spics->perip_cfg))