Commit fb722887 authored by Linus Walleij's avatar Linus Walleij

gpio: amdpt: 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: YD Tseng <ltyu101@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 57683ec2
...@@ -31,11 +31,9 @@ struct pt_gpio_chip { ...@@ -31,11 +31,9 @@ struct pt_gpio_chip {
spinlock_t lock; spinlock_t lock;
}; };
#define to_pt_gpio(c) container_of(c, struct pt_gpio_chip, gc)
static int pt_gpio_request(struct gpio_chip *gc, unsigned offset) static int pt_gpio_request(struct gpio_chip *gc, unsigned offset)
{ {
struct pt_gpio_chip *pt_gpio = to_pt_gpio(gc); struct pt_gpio_chip *pt_gpio = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
u32 using_pins; u32 using_pins;
...@@ -60,7 +58,7 @@ static int pt_gpio_request(struct gpio_chip *gc, unsigned offset) ...@@ -60,7 +58,7 @@ static int pt_gpio_request(struct gpio_chip *gc, unsigned offset)
static void pt_gpio_free(struct gpio_chip *gc, unsigned offset) static void pt_gpio_free(struct gpio_chip *gc, unsigned offset)
{ {
struct pt_gpio_chip *pt_gpio = to_pt_gpio(gc); struct pt_gpio_chip *pt_gpio = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
u32 using_pins; u32 using_pins;
...@@ -77,7 +75,7 @@ static void pt_gpio_free(struct gpio_chip *gc, unsigned offset) ...@@ -77,7 +75,7 @@ static void pt_gpio_free(struct gpio_chip *gc, unsigned offset)
static void pt_gpio_set_value(struct gpio_chip *gc, unsigned offset, int value) static void pt_gpio_set_value(struct gpio_chip *gc, unsigned offset, int value)
{ {
struct pt_gpio_chip *pt_gpio = to_pt_gpio(gc); struct pt_gpio_chip *pt_gpio = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
u32 data; u32 data;
...@@ -97,7 +95,7 @@ static void pt_gpio_set_value(struct gpio_chip *gc, unsigned offset, int value) ...@@ -97,7 +95,7 @@ static void pt_gpio_set_value(struct gpio_chip *gc, unsigned offset, int value)
static int pt_gpio_get_value(struct gpio_chip *gc, unsigned offset) static int pt_gpio_get_value(struct gpio_chip *gc, unsigned offset)
{ {
struct pt_gpio_chip *pt_gpio = to_pt_gpio(gc); struct pt_gpio_chip *pt_gpio = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
u32 data; u32 data;
...@@ -124,7 +122,7 @@ static int pt_gpio_get_value(struct gpio_chip *gc, unsigned offset) ...@@ -124,7 +122,7 @@ static int pt_gpio_get_value(struct gpio_chip *gc, unsigned offset)
static int pt_gpio_direction_input(struct gpio_chip *gc, unsigned offset) static int pt_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
{ {
struct pt_gpio_chip *pt_gpio = to_pt_gpio(gc); struct pt_gpio_chip *pt_gpio = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
u32 data; u32 data;
...@@ -144,7 +142,7 @@ static int pt_gpio_direction_input(struct gpio_chip *gc, unsigned offset) ...@@ -144,7 +142,7 @@ static int pt_gpio_direction_input(struct gpio_chip *gc, unsigned offset)
static int pt_gpio_direction_output(struct gpio_chip *gc, static int pt_gpio_direction_output(struct gpio_chip *gc,
unsigned offset, int value) unsigned offset, int value)
{ {
struct pt_gpio_chip *pt_gpio = to_pt_gpio(gc); struct pt_gpio_chip *pt_gpio = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
u32 data; u32 data;
...@@ -214,7 +212,7 @@ static int pt_gpio_probe(struct platform_device *pdev) ...@@ -214,7 +212,7 @@ static int pt_gpio_probe(struct platform_device *pdev)
#if defined(CONFIG_OF_GPIO) #if defined(CONFIG_OF_GPIO)
pt_gpio->gc.of_node = pdev->dev.of_node; pt_gpio->gc.of_node = pdev->dev.of_node;
#endif #endif
ret = gpiochip_add(&pt_gpio->gc); ret = gpiochip_add_data(&pt_gpio->gc, pt_gpio);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to register GPIO lib\n"); dev_err(&pdev->dev, "Failed to register GPIO lib\n");
return ret; return ret;
......
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