Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01f76b26 authored by Linus Walleij's avatar Linus Walleij
Browse files

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

Acked-By: default avatarJassi Brar <jaswinder.singh@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 0788b644

drivers/gpio/gpio-mb86s7x.c

+7 −12
Original line number Diff line number Diff line
@@ -44,14 +44,9 @@ struct mb86s70_gpio_chip { 
	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)

{

	struct mb86s70_gpio_chip *gchip = chip_to_mb86s70(gc);

	struct mb86s70_gpio_chip *gchip = gpiochip_get_data(gc);

	unsigned long flags;

	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)

{

	struct mb86s70_gpio_chip *gchip = chip_to_mb86s70(gc);

	struct mb86s70_gpio_chip *gchip = gpiochip_get_data(gc);

	unsigned long flags;

	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)

{

	struct mb86s70_gpio_chip *gchip = chip_to_mb86s70(gc);

	struct mb86s70_gpio_chip *gchip = gpiochip_get_data(gc);

	unsigned long flags;

	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,

					 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 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)

{

	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));

}



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 char val;
@@ -192,7 +187,7 @@ static int mb86s70_gpio_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, gchip);



	ret = gpiochip_add(&gchip->gc);

	ret = gpiochip_add_data(&gchip->gc, gchip);

	if (ret) {

		dev_err(&pdev->dev, "couldn't register gpio driver\n");

		clk_disable_unprepare(gchip->clk);