Commit d9478044 authored by Linus Walleij's avatar Linus Walleij

input: ad7879: use gpiochip data pointer

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: default avatarMichael Hennerich <michael.hennerich@analog.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 839850f4
...@@ -379,7 +379,7 @@ static const struct attribute_group ad7879_attr_group = { ...@@ -379,7 +379,7 @@ static const struct attribute_group ad7879_attr_group = {
static int ad7879_gpio_direction_input(struct gpio_chip *chip, static int ad7879_gpio_direction_input(struct gpio_chip *chip,
unsigned gpio) unsigned gpio)
{ {
struct ad7879 *ts = container_of(chip, struct ad7879, gc); struct ad7879 *ts = gpiochip_get_data(chip);
int err; int err;
mutex_lock(&ts->mutex); mutex_lock(&ts->mutex);
...@@ -393,7 +393,7 @@ static int ad7879_gpio_direction_input(struct gpio_chip *chip, ...@@ -393,7 +393,7 @@ static int ad7879_gpio_direction_input(struct gpio_chip *chip,
static int ad7879_gpio_direction_output(struct gpio_chip *chip, static int ad7879_gpio_direction_output(struct gpio_chip *chip,
unsigned gpio, int level) unsigned gpio, int level)
{ {
struct ad7879 *ts = container_of(chip, struct ad7879, gc); struct ad7879 *ts = gpiochip_get_data(chip);
int err; int err;
mutex_lock(&ts->mutex); mutex_lock(&ts->mutex);
...@@ -412,7 +412,7 @@ static int ad7879_gpio_direction_output(struct gpio_chip *chip, ...@@ -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) 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; u16 val;
mutex_lock(&ts->mutex); mutex_lock(&ts->mutex);
...@@ -425,7 +425,7 @@ static int ad7879_gpio_get_value(struct gpio_chip *chip, unsigned gpio) ...@@ -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, static void ad7879_gpio_set_value(struct gpio_chip *chip,
unsigned gpio, int value) unsigned gpio, int value)
{ {
struct ad7879 *ts = container_of(chip, struct ad7879, gc); struct ad7879 *ts = gpiochip_get_data(chip);
mutex_lock(&ts->mutex); mutex_lock(&ts->mutex);
if (value) if (value)
...@@ -456,7 +456,7 @@ static int ad7879_gpio_add(struct ad7879 *ts, ...@@ -456,7 +456,7 @@ static int ad7879_gpio_add(struct ad7879 *ts,
ts->gc.owner = THIS_MODULE; ts->gc.owner = THIS_MODULE;
ts->gc.parent = ts->dev; ts->gc.parent = ts->dev;
ret = gpiochip_add(&ts->gc); ret = gpiochip_add_data(&ts->gc, ts);
if (ret) if (ret)
dev_err(ts->dev, "failed to register gpio %d\n", dev_err(ts->dev, "failed to register gpio %d\n",
ts->gc.base); ts->gc.base);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment