Commit 5060e0e8 authored by Linus Walleij's avatar Linus Walleij

gpio: adp5520: 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().
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 1e69c4fe
...@@ -27,7 +27,7 @@ static int adp5520_gpio_get_value(struct gpio_chip *chip, unsigned off) ...@@ -27,7 +27,7 @@ static int adp5520_gpio_get_value(struct gpio_chip *chip, unsigned off)
struct adp5520_gpio *dev; struct adp5520_gpio *dev;
uint8_t reg_val; uint8_t reg_val;
dev = container_of(chip, struct adp5520_gpio, gpio_chip); dev = gpiochip_get_data(chip);
/* /*
* There are dedicated registers for GPIO IN/OUT. * There are dedicated registers for GPIO IN/OUT.
...@@ -46,7 +46,7 @@ static void adp5520_gpio_set_value(struct gpio_chip *chip, ...@@ -46,7 +46,7 @@ static void adp5520_gpio_set_value(struct gpio_chip *chip,
unsigned off, int val) unsigned off, int val)
{ {
struct adp5520_gpio *dev; struct adp5520_gpio *dev;
dev = container_of(chip, struct adp5520_gpio, gpio_chip); dev = gpiochip_get_data(chip);
if (val) if (val)
adp5520_set_bits(dev->master, ADP5520_GPIO_OUT, dev->lut[off]); adp5520_set_bits(dev->master, ADP5520_GPIO_OUT, dev->lut[off]);
...@@ -57,7 +57,7 @@ static void adp5520_gpio_set_value(struct gpio_chip *chip, ...@@ -57,7 +57,7 @@ static void adp5520_gpio_set_value(struct gpio_chip *chip,
static int adp5520_gpio_direction_input(struct gpio_chip *chip, unsigned off) static int adp5520_gpio_direction_input(struct gpio_chip *chip, unsigned off)
{ {
struct adp5520_gpio *dev; struct adp5520_gpio *dev;
dev = container_of(chip, struct adp5520_gpio, gpio_chip); dev = gpiochip_get_data(chip);
clear_bit(off, &dev->output); clear_bit(off, &dev->output);
...@@ -70,7 +70,7 @@ static int adp5520_gpio_direction_output(struct gpio_chip *chip, ...@@ -70,7 +70,7 @@ static int adp5520_gpio_direction_output(struct gpio_chip *chip,
{ {
struct adp5520_gpio *dev; struct adp5520_gpio *dev;
int ret = 0; int ret = 0;
dev = container_of(chip, struct adp5520_gpio, gpio_chip); dev = gpiochip_get_data(chip);
set_bit(off, &dev->output); set_bit(off, &dev->output);
...@@ -153,7 +153,7 @@ static int adp5520_gpio_probe(struct platform_device *pdev) ...@@ -153,7 +153,7 @@ static int adp5520_gpio_probe(struct platform_device *pdev)
goto err; goto err;
} }
ret = gpiochip_add(&dev->gpio_chip); ret = gpiochip_add_data(&dev->gpio_chip, dev);
if (ret) if (ret)
goto err; goto err;
......
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