pinctrl: vt8500-wmt: 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().

Cc: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/vt8500/pinctrl-wmt.c b/drivers/pinctrl/vt8500/pinctrl-wmt.c
index e9c1dfd..5c261bf 100644 (file)
--- a/drivers/pinctrl/vt8500/pinctrl-wmt.c
+++ b/drivers/pinctrl/vt8500/pinctrl-wmt.c
@@ -14,7 +14,7 @@
  */
 
 #include <linux/err.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/irq.h>
@@ -488,7 +488,7 @@ static struct pinctrl_desc wmt_desc = {
 
 static int wmt_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
 {
-       struct wmt_pinctrl_data *data = dev_get_drvdata(chip->parent);
+       struct wmt_pinctrl_data *data = gpiochip_get_data(chip);
        u32 bank = WMT_BANK_FROM_PIN(offset);
        u32 bit = WMT_BIT_FROM_PIN(offset);
        u32 reg_dir = data->banks[bank].reg_dir;
@@ -503,7 +503,7 @@ static int wmt_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
 
 static int wmt_gpio_get_value(struct gpio_chip *chip, unsigned offset)
 {
-       struct wmt_pinctrl_data *data = dev_get_drvdata(chip->parent);
+       struct wmt_pinctrl_data *data = gpiochip_get_data(chip);
        u32 bank = WMT_BANK_FROM_PIN(offset);
        u32 bit = WMT_BIT_FROM_PIN(offset);
        u32 reg_data_in = data->banks[bank].reg_data_in;
@@ -519,7 +519,7 @@ static int wmt_gpio_get_value(struct gpio_chip *chip, unsigned offset)
 static void wmt_gpio_set_value(struct gpio_chip *chip, unsigned offset,
                               int val)
 {
-       struct wmt_pinctrl_data *data = dev_get_drvdata(chip->parent);
+       struct wmt_pinctrl_data *data = gpiochip_get_data(chip);
        u32 bank = WMT_BANK_FROM_PIN(offset);
        u32 bit = WMT_BIT_FROM_PIN(offset);
        u32 reg_data_out = data->banks[bank].reg_data_out;
@@ -589,7 +589,7 @@ int wmt_pinctrl_probe(struct platform_device *pdev,
                return PTR_ERR(data->pctl_dev);
        }
 
-       err = gpiochip_add(&data->gpio_chip);
+       err = gpiochip_add_data(&data->gpio_chip, data);
        if (err) {
                dev_err(&pdev->dev, "could not add GPIO chip\n");
                goto fail_gpio;