[PATCH 157/182] input: ad7879: 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: Michael Hennerich <michael.henner...@analog.com>
Cc: Dmitry Torokhov <dmitry.torok...@gmail.com>
Signed-off-by: Linus Walleij <linus.wall...@linaro.org>
---
Dmitry: please ACK this so I can take it through the GPIO tree.
---
 drivers/input/touchscreen/ad7879.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/input/touchscreen/ad7879.c 
b/drivers/input/touchscreen/ad7879.c
index 16b5cc2196f2..583a0590ceb2 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -379,7 +379,7 @@ static const struct attribute_group ad7879_attr_group = {
 static int ad7879_gpio_direction_input(struct gpio_chip *chip,
                                        unsigned gpio)
 {
-       struct ad7879 *ts = container_of(chip, struct ad7879, gc);
+       struct ad7879 *ts = gpiochip_get_data(chip);
        int err;
 
        mutex_lock(&ts->mutex);
@@ -393,7 +393,7 @@ static int ad7879_gpio_direction_input(struct gpio_chip 
*chip,
 static int ad7879_gpio_direction_output(struct gpio_chip *chip,
                                        unsigned gpio, int level)
 {
-       struct ad7879 *ts = container_of(chip, struct ad7879, gc);
+       struct ad7879 *ts = gpiochip_get_data(chip);
        int err;
 
        mutex_lock(&ts->mutex);
@@ -412,7 +412,7 @@ static int ad7879_gpio_direction_output(struct gpio_chip 
*chip,
 
 static int ad7879_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
 {
-       struct ad7879 *ts = container_of(chip, struct ad7879, gc);
+       struct ad7879 *ts = gpiochip_get_data(chip);
        u16 val;
 
        mutex_lock(&ts->mutex);
@@ -425,7 +425,7 @@ static int ad7879_gpio_get_value(struct gpio_chip *chip, 
unsigned gpio)
 static void ad7879_gpio_set_value(struct gpio_chip *chip,
                                  unsigned gpio, int value)
 {
-       struct ad7879 *ts = container_of(chip, struct ad7879, gc);
+       struct ad7879 *ts = gpiochip_get_data(chip);
 
        mutex_lock(&ts->mutex);
        if (value)
@@ -456,7 +456,7 @@ static int ad7879_gpio_add(struct ad7879 *ts,
                ts->gc.owner = THIS_MODULE;
                ts->gc.parent = ts->dev;
 
-               ret = gpiochip_add(&ts->gc);
+               ret = gpiochip_add_data(&ts->gc, ts);
                if (ret)
                        dev_err(ts->dev, "failed to register gpio %d\n",
                                ts->gc.base);
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html