leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: pxa: use gpiochip data pointer

Browse Source 
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: Daniel Mack <zonque@gmail.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-07 11:42:22 +01:00
parent d81b37fcad
commit 81d0c31d11
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpio/gpio-pxa.c
View File

@ -155,14 +155,15 @@ static struct pxa_gpio_id pxa1928_id = {
static inline struct pxa_gpio_chip *chip_to_pxachip(struct gpio_chip *c) static inline struct pxa_gpio_chip *chip_to_pxachip(struct gpio_chip *c)
{ {
struct pxa_gpio_chip *pxa_chip = struct pxa_gpio_chip *pxa_chip = gpiochip_get_data(c);
container_of(c, struct pxa_gpio_chip, chip);
return pxa_chip; return pxa_chip;
} }
static inline void __iomem *gpio_bank_base(struct gpio_chip *c, int gpio) static inline void __iomem *gpio_bank_base(struct gpio_chip *c, int gpio)
{ {
struct pxa_gpio_bank *bank = chip_to_pxachip(c)->banks + (gpio / 32); struct pxa_gpio_chip *p = gpiochip_get_data(c);
struct pxa_gpio_bank *bank = p->banks + (gpio / 32);
return bank->regbase; return bank->regbase;
} }
@ -370,7 +371,7 @@ static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio,
bank->regbase = regbase + BANK_OFF(i); bank->regbase = regbase + BANK_OFF(i);
} }
return gpiochip_add(&pchip->chip); return gpiochip_add_data(&pchip->chip, pchip);
} }
/* Update only those GRERx and GFERx edge detection register bits if those /* Update only those GRERx and GFERx edge detection register bits if those