OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gpio: lpc18xx: 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().

Acked-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-07 09:13:57 +01:00
parent a2f3380465
commit d3de31d467
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpio/gpio-lpc18xx.c
View File

@ -31,27 +31,22 @@ struct lpc18xx_gpio_chip {
spinlock_t lock; spinlock_t lock;
}; };
static inline struct lpc18xx_gpio_chip *to_lpc18xx_gpio(struct gpio_chip *chip)
{
return container_of(chip, struct lpc18xx_gpio_chip, gpio);
}
static void lpc18xx_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static void lpc18xx_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
{ {
struct lpc18xx_gpio_chip *gc = to_lpc18xx_gpio(chip); struct lpc18xx_gpio_chip *gc = gpiochip_get_data(chip);
writeb(value ? 1 : 0, gc->base + offset); writeb(value ? 1 : 0, gc->base + offset);
} }
static int lpc18xx_gpio_get(struct gpio_chip *chip, unsigned offset) static int lpc18xx_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
struct lpc18xx_gpio_chip *gc = to_lpc18xx_gpio(chip); struct lpc18xx_gpio_chip *gc = gpiochip_get_data(chip);
return !!readb(gc->base + offset); return !!readb(gc->base + offset);
} }
static int lpc18xx_gpio_direction(struct gpio_chip *chip, unsigned offset, static int lpc18xx_gpio_direction(struct gpio_chip *chip, unsigned offset,
bool out) bool out)
{ {
struct lpc18xx_gpio_chip *gc = to_lpc18xx_gpio(chip); struct lpc18xx_gpio_chip *gc = gpiochip_get_data(chip);
unsigned long flags; unsigned long flags;
u32 port, pin, dir; u32 port, pin, dir;
@ -129,7 +124,7 @@ static int lpc18xx_gpio_probe(struct platform_device *pdev)
gc->gpio.parent = &pdev->dev; gc->gpio.parent = &pdev->dev;
ret = gpiochip_add(&gc->gpio); ret = gpiochip_add_data(&gc->gpio, gc);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to add gpio chip\n"); dev_err(&pdev->dev, "failed to add gpio chip\n");
clk_disable_unprepare(gc->clk); clk_disable_unprepare(gc->clk);