diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-12-06 00:36:39 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-01-05 11:21:05 +0100 |
| commit | 6219e7bba9d52ea5d40cd50d0cfe6059c2630fab (patch) | |
| tree | 35693aa73598b5bfd71963175a1b725e685e5c02 /drivers/gpio/gpio-em.c | |
| parent | 1880657a15842d2e617789f98a7a68f61c870592 (diff) | |
| download | linux-6219e7bba9d52ea5d40cd50d0cfe6059c2630fab.tar.gz linux-6219e7bba9d52ea5d40cd50d0cfe6059c2630fab.tar.bz2 linux-6219e7bba9d52ea5d40cd50d0cfe6059c2630fab.zip | |
gpio: em: 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: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Magnus Damm <damm@opensource.se>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-em.c')
| -rw-r--r-- | drivers/gpio/gpio-em.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c index d726c68c4a65..8d32ccc980d9 100644 --- a/drivers/gpio/gpio-em.c +++ b/drivers/gpio/gpio-em.c @@ -192,7 +192,7 @@ static irqreturn_t em_gio_irq_handler(int irq, void *dev_id) static inline struct em_gio_priv *gpio_to_priv(struct gpio_chip *chip) { - return container_of(chip, struct em_gio_priv, gpio_chip); + return gpiochip_get_data(chip); } static int em_gio_direction_input(struct gpio_chip *chip, unsigned offset) @@ -368,7 +368,7 @@ static int em_gio_probe(struct platform_device *pdev) goto err1; } - ret = gpiochip_add(gpio_chip); + ret = gpiochip_add_data(gpio_chip, p); if (ret) { dev_err(&pdev->dev, "failed to add GPIO controller\n"); goto err1; |