gpio: ucb1400: 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: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-ucb1400.c b/drivers/gpio/gpio-ucb1400.c
index cca78fb9b0dfaab5d0d3ac880d2d0c7c66aa0170..2c5cd46bfa6ea62538714d07aa38b0b358e42ebb 100644 (file)
--- a/drivers/gpio/gpio-ucb1400.c
+++ b/drivers/gpio/gpio-ucb1400.c
@@ -15,7 +15,7 @@
 static int ucb1400_gpio_dir_in(struct gpio_chip *gc, unsigned off)
 {
        struct ucb1400_gpio *gpio;
-       gpio = container_of(gc, struct ucb1400_gpio, gc);
+       gpio = gpiochip_get_data(gc);
        ucb1400_gpio_set_direction(gpio->ac97, off, 0);
        return 0;
 }
@@ -23,7 +23,7 @@ static int ucb1400_gpio_dir_in(struct gpio_chip *gc, unsigned off)
 static int ucb1400_gpio_dir_out(struct gpio_chip *gc, unsigned off, int val)
 {
        struct ucb1400_gpio *gpio;
-       gpio = container_of(gc, struct ucb1400_gpio, gc);
+       gpio = gpiochip_get_data(gc);
        ucb1400_gpio_set_direction(gpio->ac97, off, 1);
        ucb1400_gpio_set_value(gpio->ac97, off, val);
        return 0;
@@ -32,14 +32,15 @@ static int ucb1400_gpio_dir_out(struct gpio_chip *gc, unsigned off, int val)
 static int ucb1400_gpio_get(struct gpio_chip *gc, unsigned off)
 {
        struct ucb1400_gpio *gpio;
-       gpio = container_of(gc, struct ucb1400_gpio, gc);
+
+       gpio = gpiochip_get_data(gc);
        return !!ucb1400_gpio_get_value(gpio->ac97, off);
 }
 
 static void ucb1400_gpio_set(struct gpio_chip *gc, unsigned off, int val)
 {
        struct ucb1400_gpio *gpio;
-       gpio = container_of(gc, struct ucb1400_gpio, gc);
+       gpio = gpiochip_get_data(gc);
        ucb1400_gpio_set_value(gpio->ac97, off, val);
 }
 
@@ -66,7 +67,7 @@ static int ucb1400_gpio_probe(struct platform_device *dev)
        ucb->gc.set = ucb1400_gpio_set;
        ucb->gc.can_sleep = true;
 
-       err = gpiochip_add(&ucb->gc);
+       err = gpiochip_add_data(&ucb->gc, ucb);
        if (err)
                goto err;