summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-gemini
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-12-08 10:56:49 +0100
committerLinus Walleij <linus.walleij@linaro.org>2016-02-19 09:51:41 +0100
commit90b9bb81bca0eb8e5410f11c527ca1834c8ea46a (patch)
treea4e40d206518ef5443eecc198094c96978d3011f /arch/arm/mach-gemini
parent050c542938359f6629d28282f9234fdda0b29b33 (diff)
downloadlinux-90b9bb81bca0eb8e5410f11c527ca1834c8ea46a.tar.bz2
ARM: gemini: 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>
Diffstat (limited to 'arch/arm/mach-gemini')
-rw-r--r--arch/arm/mach-gemini/gpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-gemini/gpio.c b/arch/arm/mach-gemini/gpio.c
index 2478d9f4d92d..469a76ea0459 100644
--- a/arch/arm/mach-gemini/gpio.c
+++ b/arch/arm/mach-gemini/gpio.c
@@ -17,7 +17,7 @@
#include <linux/init.h>
#include <linux/io.h>
#include <linux/irq.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
@@ -227,5 +227,5 @@ void __init gemini_gpio_init(void)
(void *)i);
}
- BUG_ON(gpiochip_add(&gemini_gpio_chip));
+ BUG_ON(gpiochip_add_data(&gemini_gpio_chip, NULL));
}