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

Commit 231d51b8 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: altera: use container_of() to get state container 



The state container of the Altera GPIO driver is extracted from
the gpio_chip exploiting the fact that offsetof() the
struct gpio_chip inside the struct of_mm_gpio_chip are both 0, so
the container_of() is in practice a noop. However if a member
is added to struct altera_gpio_chip in front of
struct of_mm_gpio_chip, things will break. Using proper
container_of() avoids this problem.

Semantically this is a noop, the compiler will optimize it away,
but syntactically it makes me happier.

Cc: Tien Hock Loh <thloh@altera.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 4843289e

drivers/gpio/gpio-altera.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -42,6 +42,11 @@ struct altera_gpio_chip { 
	int mapped_irq;

	int mapped_irq;

};

};





static struct altera_gpio_chip *to_altera(struct gpio_chip *gc)

{

	return container_of(gc, struct altera_gpio_chip, mmchip.gc);

}



static void altera_gpio_irq_unmask(struct irq_data *d)

static void altera_gpio_irq_unmask(struct irq_data *d)

{

{

	struct altera_gpio_chip *altera_gc;

	struct altera_gpio_chip *altera_gc;
@@ -49,7 +54,7 @@ static void altera_gpio_irq_unmask(struct irq_data *d) 
	unsigned long flags;

	unsigned long flags;

	u32 intmask;

	u32 intmask;





	altera_gc = irq_data_get_irq_chip_data(d);

	altera_gc = to_altera(irq_data_get_irq_chip_data(d));

	mm_gc = &altera_gc->mmchip;

	mm_gc = &altera_gc->mmchip;





	spin_lock_irqsave(&altera_gc->gpio_lock, flags);

	spin_lock_irqsave(&altera_gc->gpio_lock, flags);
@@ -67,7 +72,7 @@ static void altera_gpio_irq_mask(struct irq_data *d) 
	unsigned long flags;

	unsigned long flags;

	u32 intmask;

	u32 intmask;





	altera_gc = irq_data_get_irq_chip_data(d);

	altera_gc = to_altera(irq_data_get_irq_chip_data(d));

	mm_gc = &altera_gc->mmchip;

	mm_gc = &altera_gc->mmchip;





	spin_lock_irqsave(&altera_gc->gpio_lock, flags);

	spin_lock_irqsave(&altera_gc->gpio_lock, flags);
@@ -87,7 +92,7 @@ static int altera_gpio_irq_set_type(struct irq_data *d, 
{

{

	struct altera_gpio_chip *altera_gc;

	struct altera_gpio_chip *altera_gc;





	altera_gc = irq_data_get_irq_chip_data(d);

	altera_gc = to_altera(irq_data_get_irq_chip_data(d));





	if (type == IRQ_TYPE_NONE)

	if (type == IRQ_TYPE_NONE)

		return 0;

		return 0;
@@ -210,7 +215,7 @@ static void altera_gpio_irq_edge_handler(struct irq_desc *desc) 
	unsigned long status;

	unsigned long status;

	int i;

	int i;





	altera_gc = irq_desc_get_handler_data(desc);

	altera_gc = to_altera(irq_desc_get_handler_data(desc));

	chip = irq_desc_get_chip(desc);

	chip = irq_desc_get_chip(desc);

	mm_gc = &altera_gc->mmchip;

	mm_gc = &altera_gc->mmchip;

	irqdomain = altera_gc->mmchip.gc.irqdomain;

	irqdomain = altera_gc->mmchip.gc.irqdomain;
@@ -239,7 +244,7 @@ static void altera_gpio_irq_leveL_high_handler(struct irq_desc *desc) 
	unsigned long status;

	unsigned long status;

	int i;

	int i;





	altera_gc = irq_desc_get_handler_data(desc);

	altera_gc = to_altera(irq_desc_get_handler_data(desc));

	chip = irq_desc_get_chip(desc);

	chip = irq_desc_get_chip(desc);

	mm_gc = &altera_gc->mmchip;

	mm_gc = &altera_gc->mmchip;

	irqdomain = altera_gc->mmchip.gc.irqdomain;

	irqdomain = altera_gc->mmchip.gc.irqdomain;