[PATCH 152/182] unicore32: gpio: switch to gpiochip_add_data()

[PATCH 152/182] unicore32: gpio: switch to gpiochip_add_data()

[Linus Walleij]

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

Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Guan please ACK this so I can take it through the GPIO tree.
BTW this could possibly move to drivers/gpio but I don't have
the whole picture here. The internal consumers should be
converted to the GPIO descriptor API.
---
 arch/unicore32/kernel/gpio.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/unicore32/kernel/gpio.c b/arch/unicore32/kernel/gpio.c
index cb12ec39552c..54a54c335a72 100644
--- a/arch/unicore32/kernel/gpio.c
+++ b/arch/unicore32/kernel/gpio.c
@@ -14,6 +14,8 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/gpio/driver.h>
+/* FIXME: needed for gpio_set_value() - convert to use descriptors or hogs */
 #include <linux/gpio.h>
 #include <mach/hardware.h>
 
@@ -118,5 +120,5 @@ void __init puv3_init_gpio(void)
  *	gpio_set_value(GPO_SET_V2, 1);
  */
 #endif
-	gpiochip_add(&puv3_gpio_chip);
+	gpiochip_add_data(&puv3_gpio_chip, NULL);
 }
-- 
2.4.3

Re: [PATCH 152/182] unicore32: gpio: switch to gpiochip_add_data()

[Xuetao Guan]

> We're planning to remove the gpiochip_add() function to swith
> to gpiochip_add_data() with NULL for data argument.
>
> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Thanks,
Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>

> ---
> Guan please ACK this so I can take it through the GPIO tree.
> BTW this could possibly move to drivers/gpio but I don't have
> the whole picture here. The internal consumers should be
> converted to the GPIO descriptor API.
> ---
>  arch/unicore32/kernel/gpio.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/unicore32/kernel/gpio.c b/arch/unicore32/kernel/gpio.c
> index cb12ec39552c..54a54c335a72 100644
> --- a/arch/unicore32/kernel/gpio.c
> +++ b/arch/unicore32/kernel/gpio.c
> @@ -14,6 +14,8 @@
>
>  #include <linux/init.h>
>  #include <linux/module.h>
> +#include <linux/gpio/driver.h>
> +/* FIXME: needed for gpio_set_value() - convert to use descriptors or
> hogs */
>  #include <linux/gpio.h>
>  #include <mach/hardware.h>
>
> @@ -118,5 +120,5 @@ void __init puv3_init_gpio(void)
>   *	gpio_set_value(GPO_SET_V2, 1);
>   */
>  #endif
> -	gpiochip_add(&puv3_gpio_chip);
> +	gpiochip_add_data(&puv3_gpio_chip, NULL);
>  }
> --
> 2.4.3
>