Commit b0d38473 authored by Linus Walleij's avatar Linus Walleij
Browse files

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

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 0ca8c5c4

drivers/gpio/gpio-tc3589x.c

+10 −15
Original line number Diff line number Diff line
@@ -34,14 +34,9 @@ struct tc3589x_gpio { 
	u8 oldregs[CACHE_NR_REGS][CACHE_NR_BANKS];

};



static inline struct tc3589x_gpio *to_tc3589x_gpio(struct gpio_chip *chip)

{

	return container_of(chip, struct tc3589x_gpio, chip);

}



static int tc3589x_gpio_get(struct gpio_chip *chip, unsigned offset)

{

	struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(chip);

	struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(chip);

	struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;

	u8 reg = TC3589x_GPIODATA0 + (offset / 8) * 2;

	u8 mask = 1 << (offset % 8);
@@ -56,7 +51,7 @@ static int tc3589x_gpio_get(struct gpio_chip *chip, unsigned offset) 


static void tc3589x_gpio_set(struct gpio_chip *chip, unsigned offset, int val)

{

	struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(chip);

	struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(chip);

	struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;

	u8 reg = TC3589x_GPIODATA0 + (offset / 8) * 2;

	unsigned pos = offset % 8;
@@ -68,7 +63,7 @@ static void tc3589x_gpio_set(struct gpio_chip *chip, unsigned offset, int val) 
static int tc3589x_gpio_direction_output(struct gpio_chip *chip,

					 unsigned offset, int val)

{

	struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(chip);

	struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(chip);

	struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;

	u8 reg = TC3589x_GPIODIR0 + offset / 8;

	unsigned pos = offset % 8;
@@ -81,7 +76,7 @@ static int tc3589x_gpio_direction_output(struct gpio_chip *chip, 
static int tc3589x_gpio_direction_input(struct gpio_chip *chip,

					unsigned offset)

{

	struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(chip);

	struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(chip);

	struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;

	u8 reg = TC3589x_GPIODIR0 + offset / 8;

	unsigned pos = offset % 8;
@@ -102,7 +97,7 @@ static struct gpio_chip template_chip = { 
static int tc3589x_gpio_irq_set_type(struct irq_data *d, unsigned int type)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(gc);

	struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(gc);

	int offset = d->hwirq;

	int regoffset = offset / 8;

	int mask = 1 << (offset % 8);
@@ -130,7 +125,7 @@ static int tc3589x_gpio_irq_set_type(struct irq_data *d, unsigned int type) 
static void tc3589x_gpio_irq_lock(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(gc);

	struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(gc);



	mutex_lock(&tc3589x_gpio->irq_lock);

}
@@ -138,7 +133,7 @@ static void tc3589x_gpio_irq_lock(struct irq_data *d) 
static void tc3589x_gpio_irq_sync_unlock(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(gc);

	struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(gc);

	struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;

	static const u8 regmap[] = {

		[REG_IBE]	= TC3589x_GPIOIBE0,
@@ -167,7 +162,7 @@ static void tc3589x_gpio_irq_sync_unlock(struct irq_data *d) 
static void tc3589x_gpio_irq_mask(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(gc);

	struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(gc);

	int offset = d->hwirq;

	int regoffset = offset / 8;

	int mask = 1 << (offset % 8);
@@ -178,7 +173,7 @@ static void tc3589x_gpio_irq_mask(struct irq_data *d) 
static void tc3589x_gpio_irq_unmask(struct irq_data *d)

{

	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);

	struct tc3589x_gpio *tc3589x_gpio = to_tc3589x_gpio(gc);

	struct tc3589x_gpio *tc3589x_gpio = gpiochip_get_data(gc);

	int offset = d->hwirq;

	int regoffset = offset / 8;

	int mask = 1 << (offset % 8);
@@ -277,7 +272,7 @@ static int tc3589x_gpio_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = gpiochip_add(&tc3589x_gpio->chip);

	ret = gpiochip_add_data(&tc3589x_gpio->chip, tc3589x_gpio);

	if (ret) {

		dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);

		return ret;