summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-12-08 16:02:00 +0100
committerLinus Walleij <linus.walleij@linaro.org>2016-03-30 10:53:51 +0200
commitefed58f1c574a31c03447afffe69440e83fdf84d (patch)
tree2d13c262cb7e4b981c600a849fa845a4137581d2
parenta8cb826aeab84553a30af22ca6d6b95a6513adb2 (diff)
downloadblackbird-op-linux-efed58f1c574a31c03447afffe69440e83fdf84d.tar.gz
blackbird-op-linux-efed58f1c574a31c03447afffe69440e83fdf84d.zip
sh: x3proto-gpio: 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: Paul Mundt <lethal@linux-sh.org> Cc: linux-sh@vger.kernel.org Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--arch/sh/boards/mach-x3proto/gpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/boards/mach-x3proto/gpio.c b/arch/sh/boards/mach-x3proto/gpio.c
index 1fb2cbee25f2..cea88b0effa2 100644
--- a/arch/sh/boards/mach-x3proto/gpio.c
+++ b/arch/sh/boards/mach-x3proto/gpio.c
@@ -13,7 +13,7 @@
#include <linux/init.h>
#include <linux/interrupt.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
#include <linux/irq.h>
#include <linux/kernel.h>
#include <linux/spinlock.h>
@@ -107,7 +107,7 @@ int __init x3proto_gpio_setup(void)
if (unlikely(ilsel < 0))
return ilsel;
- ret = gpiochip_add(&x3proto_gpio_chip);
+ ret = gpiochip_add_data(&x3proto_gpio_chip, NULL);
if (unlikely(ret))
goto err_gpio;
OpenPOWER on IntegriCloud