[PATCH 132/182] blackfin: gpio: switch to gpiochip_add_data()

[PATCH 132/182] blackfin: 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: Sonic Zhang <sonic.zhang@analog.com>
Cc: Steven Miao <realmz6@gmail.com>
Cc: adi-buildroot-devel@lists.sourceforge.net
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Blackfin maintainers: please ACK this so I can take it through
the GPIO tree.

BTW: isn't this going away? I liked Sonic's
drivers/pinctrl/pinctrl-adi2.c driver, is this adi1? It should be
modernized and moved to drivers/pinctrl.
---
 arch/blackfin/kernel/bfin_gpio.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index a017359c1826..7a91cc6ea4b2 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -11,6 +11,8 @@
 #include <linux/err.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/gpio/driver.h>
+/* FIXME: consumer API required for gpio_set_value() etc, get rid of this */
 #include <linux/gpio.h>
 #include <linux/irq.h>
 
@@ -1197,7 +1199,7 @@ static struct gpio_chip bfin_chip = {
 
 static int __init bfin_gpiolib_setup(void)
 {
-	return gpiochip_add(&bfin_chip);
+	return gpiochip_add_data(&bfin_chip, NULL);
 }
 arch_initcall(bfin_gpiolib_setup);
 #endif
-- 
2.4.3

Re: [PATCH 132/182] blackfin: gpio: switch to gpiochip_add_data()

[Sonic Zhang]

Acked-by: Sonic Zhang <sonic.zhang@analog.com>


On Wed, Dec 9, 2015 at 9:37 PM, Linus Walleij <linus.walleij@linaro.org> wrote:
> We're planning to remove the gpiochip_add() function to swith
> to gpiochip_add_data() with NULL for data argument.
>
> Cc: Sonic Zhang <sonic.zhang@analog.com>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Blackfin maintainers: please ACK this so I can take it through
> the GPIO tree.
>
> BTW: isn't this going away? I liked Sonic's
> drivers/pinctrl/pinctrl-adi2.c driver, is this adi1? It should be
> modernized and moved to drivers/pinctrl.

This is the legacy driver for Blackfin 5xx serial silicons. The
Blackfin 54x and 6xx silicons use a different pinmux model and are
only supported in driver drivers/pinctrl/pinctrl-adi2.c ,

> ---
>  arch/blackfin/kernel/bfin_gpio.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
> index a017359c1826..7a91cc6ea4b2 100644
> --- a/arch/blackfin/kernel/bfin_gpio.c
> +++ b/arch/blackfin/kernel/bfin_gpio.c
> @@ -11,6 +11,8 @@
>  #include <linux/err.h>
>  #include <linux/proc_fs.h>
>  #include <linux/seq_file.h>
> +#include <linux/gpio/driver.h>
> +/* FIXME: consumer API required for gpio_set_value() etc, get rid of this */
>  #include <linux/gpio.h>
>  #include <linux/irq.h>
>
> @@ -1197,7 +1199,7 @@ static struct gpio_chip bfin_chip = {
>
>  static int __init bfin_gpiolib_setup(void)
>  {
> -       return gpiochip_add(&bfin_chip);
> +       return gpiochip_add_data(&bfin_chip, NULL);
>  }
>  arch_initcall(bfin_gpiolib_setup);
>  #endif
> --
> 2.4.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html