| Message ID | 1459327689-12786-4-git-send-email-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 8d5f095fc5f7e36f40a80e87317828be249ee454 |
| 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(). > > Acked-by: Lee Jones <lee.jones@linaro.org> > Acked-by: Philipp Zabel <philipp.zabel@gmail.com> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > drivers/mfd/htc-egpio.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) Applied, thanks. > diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c > index c636b5f83cfb..513cfc5c8fb6 100644 > --- a/drivers/mfd/htc-egpio.c > +++ b/drivers/mfd/htc-egpio.c > @@ -155,7 +155,7 @@ static int egpio_get(struct gpio_chip *chip, unsigned offset) > > pr_debug("egpio_get_value(%d)\n", chip->base + offset); > > - egpio = container_of(chip, struct egpio_chip, chip); > + egpio = gpiochip_get_data(chip); > ei = dev_get_drvdata(egpio->dev); > bit = egpio_bit(ei, offset); > reg = egpio->reg_start + egpio_pos(ei, offset); > @@ -170,7 +170,7 @@ static int egpio_direction_input(struct gpio_chip *chip, unsigned offset) > { > struct egpio_chip *egpio; > > - egpio = container_of(chip, struct egpio_chip, chip); > + egpio = gpiochip_get_data(chip); > return test_bit(offset, &egpio->is_out) ? -EINVAL : 0; > } > > @@ -192,7 +192,7 @@ static void egpio_set(struct gpio_chip *chip, unsigned offset, int value) > pr_debug("egpio_set(%s, %d(%d), %d)\n", > chip->label, offset, offset+chip->base, value); > > - egpio = container_of(chip, struct egpio_chip, chip); > + egpio = gpiochip_get_data(chip); > ei = dev_get_drvdata(egpio->dev); > bit = egpio_bit(ei, offset); > pos = egpio_pos(ei, offset); > @@ -216,7 +216,7 @@ static int egpio_direction_output(struct gpio_chip *chip, > { > struct egpio_chip *egpio; > > - egpio = container_of(chip, struct egpio_chip, chip); > + egpio = gpiochip_get_data(chip); > if (test_bit(offset, &egpio->is_out)) { > egpio_set(chip, offset, value); > return 0; > @@ -330,7 +330,7 @@ static int __init egpio_probe(struct platform_device *pdev) > chip->base = pdata->chip[i].gpio_base; > chip->ngpio = pdata->chip[i].num_gpios; > > - gpiochip_add(chip); > + gpiochip_add_data(chip, &ei->chip[i]); > } > > /* Set initial pin values */ -- 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/htc-egpio.c b/drivers/mfd/htc-egpio.c index c636b5f83cfb..513cfc5c8fb6 100644 --- a/drivers/mfd/htc-egpio.c +++ b/drivers/mfd/htc-egpio.c @@ -155,7 +155,7 @@ static int egpio_get(struct gpio_chip *chip, unsigned offset) pr_debug("egpio_get_value(%d)\n", chip->base + offset); - egpio = container_of(chip, struct egpio_chip, chip); + egpio = gpiochip_get_data(chip); ei = dev_get_drvdata(egpio->dev); bit = egpio_bit(ei, offset); reg = egpio->reg_start + egpio_pos(ei, offset); @@ -170,7 +170,7 @@ static int egpio_direction_input(struct gpio_chip *chip, unsigned offset) { struct egpio_chip *egpio; - egpio = container_of(chip, struct egpio_chip, chip); + egpio = gpiochip_get_data(chip); return test_bit(offset, &egpio->is_out) ? -EINVAL : 0; } @@ -192,7 +192,7 @@ static void egpio_set(struct gpio_chip *chip, unsigned offset, int value) pr_debug("egpio_set(%s, %d(%d), %d)\n", chip->label, offset, offset+chip->base, value); - egpio = container_of(chip, struct egpio_chip, chip); + egpio = gpiochip_get_data(chip); ei = dev_get_drvdata(egpio->dev); bit = egpio_bit(ei, offset); pos = egpio_pos(ei, offset); @@ -216,7 +216,7 @@ static int egpio_direction_output(struct gpio_chip *chip, { struct egpio_chip *egpio; - egpio = container_of(chip, struct egpio_chip, chip); + egpio = gpiochip_get_data(chip); if (test_bit(offset, &egpio->is_out)) { egpio_set(chip, offset, value); return 0; @@ -330,7 +330,7 @@ static int __init egpio_probe(struct platform_device *pdev) chip->base = pdata->chip[i].gpio_base; chip->ngpio = pdata->chip[i].num_gpios; - gpiochip_add(chip); + gpiochip_add_data(chip, &ei->chip[i]); } /* Set initial pin values */