Merge tag 'gpio-v5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[linux-2.6-microblaze.git] / drivers / gpio / gpio-mb86s7x.c

diff --git a/drivers/gpio/gpio-mb86s7x.c b/drivers/gpio/gpio-mb86s7x.c
index 3134c0d..9308081 100644 (file)
--- a/drivers/gpio/gpio-mb86s7x.c
+++ b/drivers/gpio/gpio-mb86s7x.c
@@ -146,7 +146,6 @@ static void mb86s70_gpio_set(struct gpio_chip *gc, unsigned gpio, int value)
 static int mb86s70_gpio_probe(struct platform_device *pdev)
 {
        struct mb86s70_gpio_chip *gchip;
-       struct resource *res;
        int ret;
 
        gchip = devm_kzalloc(&pdev->dev, sizeof(*gchip), GFP_KERNEL);
@@ -155,8 +154,7 @@ static int mb86s70_gpio_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, gchip);
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       gchip->base = devm_ioremap_resource(&pdev->dev, res);
+       gchip->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(gchip->base))
                return PTR_ERR(gchip->base);