| Message ID | 1459327689-12786-2-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 082cc468385dbc7bbdc234bf6f2577e64fc00bbb |
| Headers | show |
On Wed, 30 Mar 2016, 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: Paul Parsons <lost.distance@yahoo.com> > Acked-by: Lee Jones <lee.jones@linaro.org> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > drivers/mfd/asic3.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c > index 4dca6bc61f5b..0413c8159551 100644 > --- a/drivers/mfd/asic3.c > +++ b/drivers/mfd/asic3.c > @@ -446,7 +446,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) { > @@ -492,7 +492,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) { > @@ -540,7 +540,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; > } > @@ -595,7 +595,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
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index 4dca6bc61f5b..0413c8159551 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c @@ -446,7 +446,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) { @@ -492,7 +492,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) { @@ -540,7 +540,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; } @@ -595,7 +595,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)