1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpio/timbgpio.c b/drivers/gpio/timbgpio.c
index 58c8f30352dd..ffcd815b8b8b 100644
--- a/drivers/gpio/timbgpio.c
+++ b/drivers/gpio/timbgpio.c
@@ -23,6 +23,7 @@
 #include <linux/module.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
+#include <linux/mfd/core.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/timb_gpio.h>
@@ -228,7 +229,7 @@ static int __devinit timbgpio_probe(struct platform_device *pdev)
         struct gpio_chip *gc;
         struct timbgpio *tgpio;
         struct resource *iomem;
-        struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
+        struct timbgpio_platform_data *pdata = mfd_get_data(pdev);
         int irq = platform_get_irq(pdev, 0);
 
         if (!pdata || pdata->nr_pins > 32) {
@@ -319,14 +320,13 @@ err_mem:
 static int __devexit timbgpio_remove(struct platform_device *pdev)
 {
         int err;
-        struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
         struct timbgpio *tgpio = platform_get_drvdata(pdev);
         struct resource *iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         int irq = platform_get_irq(pdev, 0);
 
         if (irq >= 0 && tgpio->irq_base > 0) {
                 int i;
-                for (i = 0; i < pdata->nr_pins; i++) {
+                for (i = 0; i < tgpio->gpio.ngpio; i++) {
                         set_irq_chip(tgpio->irq_base + i, NULL);
                         set_irq_chip_data(tgpio->irq_base + i, NULL);
                 }