ARM: simpad: switch to gpiochip_add_data()

We're planning to remove the gpiochip_add() function to swith
to gpiochip_add_data() with NULL for data argument.

Cc: arm@kernel.org
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index d8965c682d2f74a800204dc55ecc6fae0d5def5f..bb3ca9c763de0e6eaf0ddf87797c87929bb222b5 100644 (file)
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -15,7 +15,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 
 #include <mach/hardware.h>
 #include <asm/setup.h>
@@ -369,7 +369,7 @@ static int __init simpad_init(void)
        cs3_gpio.get = cs3_gpio_get;
        cs3_gpio.direction_input = cs3_gpio_direction_input;
        cs3_gpio.direction_output = cs3_gpio_direction_output;
-       ret = gpiochip_add(&cs3_gpio);
+       ret = gpiochip_add_data(&cs3_gpio, NULL);
        if (ret)
                printk(KERN_WARNING "simpad: Unable to register cs3 GPIO device");