Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[deliverable/linux.git] / drivers / pinctrl / pinctrl-coh901.c

diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c
index fbb37154471cae9579acb0cceb3890047ac97bcc..8b7e7bc2226b3be2ad7967d4381f83abfa203c6f 100644 (file)
--- a/drivers/pinctrl/pinctrl-coh901.c
+++ b/drivers/pinctrl/pinctrl-coh901.c
@@ -715,11 +715,9 @@ static int __init u300_gpio_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       gpio->base = devm_request_and_ioremap(&pdev->dev, memres);
-       if (!gpio->base) {
-               dev_err(gpio->dev, "could not get remap memory\n");
-               return -ENOMEM;
-       }
+       gpio->base = devm_ioremap_resource(&pdev->dev, memres);
+       if (IS_ERR(gpio->base))
+               return PTR_ERR(gpio->base);
 
        gpio->clk = devm_clk_get(gpio->dev, NULL);
        if (IS_ERR(gpio->clk)) {