Commit 5c809c63 authored by Linus Walleij's avatar Linus Walleij

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: default avatarLinus Walleij <linus.walleij@linaro.org>
parent dbf09b0a
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
*/ */
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio.h> #include <linux/gpio/driver.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -488,7 +488,7 @@ static struct pinctrl_desc wmt_desc = { ...@@ -488,7 +488,7 @@ static struct pinctrl_desc wmt_desc = {
static int wmt_gpio_get_direction(struct gpio_chip *chip, unsigned offset) 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 bank = WMT_BANK_FROM_PIN(offset);
u32 bit = WMT_BIT_FROM_PIN(offset); u32 bit = WMT_BIT_FROM_PIN(offset);
u32 reg_dir = data->banks[bank].reg_dir; u32 reg_dir = data->banks[bank].reg_dir;
...@@ -503,7 +503,7 @@ static int wmt_gpio_get_direction(struct gpio_chip *chip, unsigned offset) ...@@ -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) 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 bank = WMT_BANK_FROM_PIN(offset);
u32 bit = WMT_BIT_FROM_PIN(offset); u32 bit = WMT_BIT_FROM_PIN(offset);
u32 reg_data_in = data->banks[bank].reg_data_in; 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) ...@@ -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, static void wmt_gpio_set_value(struct gpio_chip *chip, unsigned offset,
int val) 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 bank = WMT_BANK_FROM_PIN(offset);
u32 bit = WMT_BIT_FROM_PIN(offset); u32 bit = WMT_BIT_FROM_PIN(offset);
u32 reg_data_out = data->banks[bank].reg_data_out; u32 reg_data_out = data->banks[bank].reg_data_out;
...@@ -589,7 +589,7 @@ int wmt_pinctrl_probe(struct platform_device *pdev, ...@@ -589,7 +589,7 @@ int wmt_pinctrl_probe(struct platform_device *pdev,
return PTR_ERR(data->pctl_dev); return PTR_ERR(data->pctl_dev);
} }
err = gpiochip_add(&data->gpio_chip); err = gpiochip_add_data(&data->gpio_chip, data);
if (err) { if (err) {
dev_err(&pdev->dev, "could not add GPIO chip\n"); dev_err(&pdev->dev, "could not add GPIO chip\n");
goto fail_gpio; goto fail_gpio;
......
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