Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index 314e300..1c70e83 100644 (file)
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -229,7 +229,6 @@ static int timbgpio_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct gpio_chip *gc;
        struct timbgpio *tgpio;
-       struct resource *iomem;
        struct timbgpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
        int irq = platform_get_irq(pdev, 0);
 
@@ -246,8 +245,7 @@ static int timbgpio_probe(struct platform_device *pdev)
 
        spin_lock_init(&tgpio->lock);
 
-       iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       tgpio->membase = devm_ioremap_resource(dev, iomem);
+       tgpio->membase = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(tgpio->membase))
                return PTR_ERR(tgpio->membase);