[PATCH 161/182] mfd: asic3: use gpiochip data pointer

[PATCH 161/182] mfd: asic3: use gpiochip data pointer

[Linus Walleij]

This makes the driver use the data pointer added to the gpio_chip
to store a pointer to the state container instead of relying on
container_of().

Cc: Lee Jones <lee.jones@linaro.org>
Cc: Paul Parsons <lost.distance@yahoo.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Lee please ACK this so I can take it through the GPIO tree.

I want to try to optimistically merge these changes without any
immutable branches, as I suspect other subsystem maintainers might
not want to pull a branch with 200+ patches into each subsystem,
but let's see what happens.
---
 drivers/mfd/asic3.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index a726f01e3b02..013ba51de819 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -447,7 +447,7 @@ static int asic3_gpio_direction(struct gpio_chip *chip,
 	unsigned long flags;
 	struct asic3 *asic;
 
-	asic = container_of(chip, struct asic3, gpio);
+	asic = gpiochip_get_data(chip);
 	gpio_base = ASIC3_GPIO_TO_BASE(offset);
 
 	if (gpio_base > ASIC3_GPIO_D_BASE) {
@@ -493,7 +493,7 @@ static int asic3_gpio_get(struct gpio_chip *chip,
 	u32 mask = ASIC3_GPIO_TO_MASK(offset);
 	struct asic3 *asic;
 
-	asic = container_of(chip, struct asic3, gpio);
+	asic = gpiochip_get_data(chip);
 	gpio_base = ASIC3_GPIO_TO_BASE(offset);
 
 	if (gpio_base > ASIC3_GPIO_D_BASE) {
@@ -513,7 +513,7 @@ static void asic3_gpio_set(struct gpio_chip *chip,
 	unsigned long flags;
 	struct asic3 *asic;
 
-	asic = container_of(chip, struct asic3, gpio);
+	asic = gpiochip_get_data(chip);
 	gpio_base = ASIC3_GPIO_TO_BASE(offset);
 
 	if (gpio_base > ASIC3_GPIO_D_BASE) {
@@ -542,7 +542,7 @@ static void asic3_gpio_set(struct gpio_chip *chip,
 
 static int asic3_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
 {
-	struct asic3 *asic = container_of(chip, struct asic3, gpio);
+	struct asic3 *asic = gpiochip_get_data(chip);
 
 	return asic->irq_base + offset;
 }
@@ -597,7 +597,7 @@ static __init int asic3_gpio_probe(struct platform_device *pdev,
 				     alt_reg[i]);
 	}
 
-	return gpiochip_add(&asic->gpio);
+	return gpiochip_add_data(&asic->gpio, asic);
 }
 
 static int asic3_gpio_remove(struct platform_device *pdev)
-- 
2.4.3

Re: [PATCH 161/182] mfd: asic3: use gpiochip data pointer

[Lee Jones]

On Wed, 09 Dec 2015, Linus Walleij wrote:

> This makes the driver use the data pointer added to the gpio_chip
> to store a pointer to the state container instead of relying on
> container_of().
> 
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: Paul Parsons <lost.distance@yahoo.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Lee please ACK this so I can take it through the GPIO tree.
> 
> I want to try to optimistically merge these changes without any
> immutable branches, as I suspect other subsystem maintainers might
> not want to pull a branch with 200+ patches into each subsystem,
> but let's see what happens.
> ---
>  drivers/mfd/asic3.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Acked-by: Lee Jones <lee.jones@linaro.org>

> diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
> index a726f01e3b02..013ba51de819 100644
> --- a/drivers/mfd/asic3.c
> +++ b/drivers/mfd/asic3.c
> @@ -447,7 +447,7 @@ static int asic3_gpio_direction(struct gpio_chip *chip,
>  	unsigned long flags;
>  	struct asic3 *asic;
>  
> -	asic = container_of(chip, struct asic3, gpio);
> +	asic = gpiochip_get_data(chip);
>  	gpio_base = ASIC3_GPIO_TO_BASE(offset);
>  
>  	if (gpio_base > ASIC3_GPIO_D_BASE) {
> @@ -493,7 +493,7 @@ static int asic3_gpio_get(struct gpio_chip *chip,
>  	u32 mask = ASIC3_GPIO_TO_MASK(offset);
>  	struct asic3 *asic;
>  
> -	asic = container_of(chip, struct asic3, gpio);
> +	asic = gpiochip_get_data(chip);
>  	gpio_base = ASIC3_GPIO_TO_BASE(offset);
>  
>  	if (gpio_base > ASIC3_GPIO_D_BASE) {
> @@ -513,7 +513,7 @@ static void asic3_gpio_set(struct gpio_chip *chip,
>  	unsigned long flags;
>  	struct asic3 *asic;
>  
> -	asic = container_of(chip, struct asic3, gpio);
> +	asic = gpiochip_get_data(chip);
>  	gpio_base = ASIC3_GPIO_TO_BASE(offset);
>  
>  	if (gpio_base > ASIC3_GPIO_D_BASE) {
> @@ -542,7 +542,7 @@ static void asic3_gpio_set(struct gpio_chip *chip,
>  
>  static int asic3_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
>  {
> -	struct asic3 *asic = container_of(chip, struct asic3, gpio);
> +	struct asic3 *asic = gpiochip_get_data(chip);
>  
>  	return asic->irq_base + offset;
>  }
> @@ -597,7 +597,7 @@ static __init int asic3_gpio_probe(struct platform_device *pdev,
>  				     alt_reg[i]);
>  	}
>  
> -	return gpiochip_add(&asic->gpio);
> +	return gpiochip_add_data(&asic->gpio, asic);
>  }
>  
>  static int asic3_gpio_remove(struct platform_device *pdev)

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
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