Commit 082cc468 authored by Linus Walleij's avatar Linus Walleij Committed by Lee Jones

mfd: asic3: 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: Paul Parsons <lost.distance@yahoo.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent cbdd535d
...@@ -446,7 +446,7 @@ static int asic3_gpio_direction(struct gpio_chip *chip, ...@@ -446,7 +446,7 @@ static int asic3_gpio_direction(struct gpio_chip *chip,
unsigned long flags; unsigned long flags;
struct asic3 *asic; struct asic3 *asic;
asic = container_of(chip, struct asic3, gpio); asic = gpiochip_get_data(chip);
gpio_base = ASIC3_GPIO_TO_BASE(offset); gpio_base = ASIC3_GPIO_TO_BASE(offset);
if (gpio_base > ASIC3_GPIO_D_BASE) { if (gpio_base > ASIC3_GPIO_D_BASE) {
...@@ -492,7 +492,7 @@ static int asic3_gpio_get(struct gpio_chip *chip, ...@@ -492,7 +492,7 @@ static int asic3_gpio_get(struct gpio_chip *chip,
u32 mask = ASIC3_GPIO_TO_MASK(offset); u32 mask = ASIC3_GPIO_TO_MASK(offset);
struct asic3 *asic; struct asic3 *asic;
asic = container_of(chip, struct asic3, gpio); asic = gpiochip_get_data(chip);
gpio_base = ASIC3_GPIO_TO_BASE(offset); gpio_base = ASIC3_GPIO_TO_BASE(offset);
if (gpio_base > ASIC3_GPIO_D_BASE) { if (gpio_base > ASIC3_GPIO_D_BASE) {
...@@ -513,7 +513,7 @@ static void asic3_gpio_set(struct gpio_chip *chip, ...@@ -513,7 +513,7 @@ static void asic3_gpio_set(struct gpio_chip *chip,
unsigned long flags; unsigned long flags;
struct asic3 *asic; struct asic3 *asic;
asic = container_of(chip, struct asic3, gpio); asic = gpiochip_get_data(chip);
gpio_base = ASIC3_GPIO_TO_BASE(offset); gpio_base = ASIC3_GPIO_TO_BASE(offset);
if (gpio_base > ASIC3_GPIO_D_BASE) { if (gpio_base > ASIC3_GPIO_D_BASE) {
...@@ -540,7 +540,7 @@ static void asic3_gpio_set(struct gpio_chip *chip, ...@@ -540,7 +540,7 @@ static void asic3_gpio_set(struct gpio_chip *chip,
static int asic3_gpio_to_irq(struct gpio_chip *chip, unsigned offset) static int asic3_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
{ {
struct asic3 *asic = container_of(chip, struct asic3, gpio); struct asic3 *asic = gpiochip_get_data(chip);
return asic->irq_base + offset; return asic->irq_base + offset;
} }
...@@ -595,7 +595,7 @@ static __init int asic3_gpio_probe(struct platform_device *pdev, ...@@ -595,7 +595,7 @@ static __init int asic3_gpio_probe(struct platform_device *pdev,
alt_reg[i]); alt_reg[i]);
} }
return gpiochip_add(&asic->gpio); return gpiochip_add_data(&asic->gpio, asic);
} }
static int asic3_gpio_remove(struct platform_device *pdev) static int asic3_gpio_remove(struct platform_device *pdev)
......
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