pinctrl: digicolor: 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: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/pinctrl-digicolor.c b/drivers/pinctrl/pinctrl-digicolor.c
index d8efb2ccac6ce56ab03155e448eb4cdfbac0df96..f1343d6ca823d5796ecca3581acc1f218072bd60 100644 (file)
--- a/drivers/pinctrl/pinctrl-digicolor.c
+++ b/drivers/pinctrl/pinctrl-digicolor.c
@@ -171,7 +171,7 @@ static struct pinmux_ops dc_pmxops = {
 
 static int dc_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
 {
-       struct dc_pinmap *pmap = container_of(chip, struct dc_pinmap, chip);
+       struct dc_pinmap *pmap = gpiochip_get_data(chip);
        int reg_off = GP_DRIVE0(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 drive;
@@ -191,7 +191,7 @@ static void dc_gpio_set(struct gpio_chip *chip, unsigned gpio, int value);
 static int dc_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
                                    int value)
 {
-       struct dc_pinmap *pmap = container_of(chip, struct dc_pinmap, chip);
+       struct dc_pinmap *pmap = gpiochip_get_data(chip);
        int reg_off = GP_DRIVE0(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 drive;
@@ -210,7 +210,7 @@ static int dc_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
 
 static int dc_gpio_get(struct gpio_chip *chip, unsigned gpio)
 {
-       struct dc_pinmap *pmap = container_of(chip, struct dc_pinmap, chip);
+       struct dc_pinmap *pmap = gpiochip_get_data(chip);
        int reg_off = GP_INPUT(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 input;
@@ -222,7 +222,7 @@ static int dc_gpio_get(struct gpio_chip *chip, unsigned gpio)
 
 static void dc_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)
 {
-       struct dc_pinmap *pmap = container_of(chip, struct dc_pinmap, chip);
+       struct dc_pinmap *pmap = gpiochip_get_data(chip);
        int reg_off = GP_OUTPUT0(gpio/PINS_PER_COLLECTION);
        int bit_off = gpio % PINS_PER_COLLECTION;
        u8 output;
@@ -258,7 +258,7 @@ static int dc_gpiochip_add(struct dc_pinmap *pmap, struct device_node *np)
 
        spin_lock_init(&pmap->lock);
 
-       ret = gpiochip_add(chip);
+       ret = gpiochip_add_data(chip, pmap);
        if (ret < 0)
                return ret;