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-bcm-kona.c

diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index c5536a5..9fa6d3a 100644 (file)
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -568,7 +568,6 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        const struct of_device_id *match;
-       struct resource *res;
        struct bcm_kona_gpio_bank *bank;
        struct bcm_kona_gpio *kona_gpio;
        struct gpio_chip *chip;
@@ -618,8 +617,7 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)
                return -ENXIO;
        }
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       kona_gpio->reg_base = devm_ioremap_resource(dev, res);
+       kona_gpio->reg_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(kona_gpio->reg_base)) {
                ret = -ENXIO;
                goto err_irq_domain;