GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 06:37:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gpio: mb86s7x: 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: Jassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-07 10:01:36 +01:00
parent 0788b64480
commit 01f76b267b
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/gpio/gpio-mb86s7x.c
View file

@ -44,14 +44,9 @@ struct mb86s70_gpio_chip {
spinlock_t lock; spinlock_t lock;
}; };
static inline struct mb86s70_gpio_chip *chip_to_mb86s70(struct gpio_chip *gc)
{
return container_of(gc, struct mb86s70_gpio_chip, gc);
}
static int mb86s70_gpio_request(struct gpio_chip *gc, unsigned gpio) static int mb86s70_gpio_request(struct gpio_chip *gc, unsigned gpio)
{ {
struct mb86s70_gpio_chip *gchip = chip_to_mb86s70(gc); struct mb86s70_gpio_chip *gchip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
u32 val; u32 val;
@ -73,7 +68,7 @@ static int mb86s70_gpio_request(struct gpio_chip *gc, unsigned gpio)
static void mb86s70_gpio_free(struct gpio_chip *gc, unsigned gpio) static void mb86s70_gpio_free(struct gpio_chip *gc, unsigned gpio)
{ {
struct mb86s70_gpio_chip *gchip = chip_to_mb86s70(gc); struct mb86s70_gpio_chip *gchip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
u32 val; u32 val;
@ -88,7 +83,7 @@ static void mb86s70_gpio_free(struct gpio_chip *gc, unsigned gpio)
static int mb86s70_gpio_direction_input(struct gpio_chip *gc, unsigned gpio) static int mb86s70_gpio_direction_input(struct gpio_chip *gc, unsigned gpio)
{ {
struct mb86s70_gpio_chip *gchip = chip_to_mb86s70(gc); struct mb86s70_gpio_chip *gchip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
unsigned char val; unsigned char val;
@ -106,7 +101,7 @@ static int mb86s70_gpio_direction_input(struct gpio_chip *gc, unsigned gpio)
static int mb86s70_gpio_direction_output(struct gpio_chip *gc, static int mb86s70_gpio_direction_output(struct gpio_chip *gc,
unsigned gpio, int value) unsigned gpio, int value)
{ {
struct mb86s70_gpio_chip *gchip = chip_to_mb86s70(gc); struct mb86s70_gpio_chip *gchip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
unsigned char val; unsigned char val;
@ -130,14 +125,14 @@ static int mb86s70_gpio_direction_output(struct gpio_chip *gc,
static int mb86s70_gpio_get(struct gpio_chip *gc, unsigned gpio) static int mb86s70_gpio_get(struct gpio_chip *gc, unsigned gpio)
{ {
struct mb86s70_gpio_chip *gchip = chip_to_mb86s70(gc); struct mb86s70_gpio_chip *gchip = gpiochip_get_data(gc);
return !!(readl(gchip->base + PDR(gpio)) & OFFSET(gpio)); return !!(readl(gchip->base + PDR(gpio)) & OFFSET(gpio));
} }
static void mb86s70_gpio_set(struct gpio_chip *gc, unsigned gpio, int value) static void mb86s70_gpio_set(struct gpio_chip *gc, unsigned gpio, int value)
{ {
struct mb86s70_gpio_chip *gchip = chip_to_mb86s70(gc); struct mb86s70_gpio_chip *gchip = gpiochip_get_data(gc);
unsigned long flags; unsigned long flags;
unsigned char val; unsigned char val;
@ -192,7 +187,7 @@ static int mb86s70_gpio_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, gchip); platform_set_drvdata(pdev, gchip);
ret = gpiochip_add(&gchip->gc); ret = gpiochip_add_data(&gchip->gc, gchip);
if (ret) { if (ret) {
dev_err(&pdev->dev, "couldn't register gpio driver\n"); dev_err(&pdev->dev, "couldn't register gpio driver\n");
clk_disable_unprepare(gchip->clk); clk_disable_unprepare(gchip->clk);