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

Commit 67d15ed7 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Linus Torvalds
Browse files

gpio: vr41xx_giu: irq_data conversion 



Converts irq_chips and flow handlers over to the new struct irq_data based
irq_chip functions.

Signed-off-by: default avatarLennert Buytenhek <buytenh@secretlab.ca>
Cc: Yoichi Yuasa <yuasa@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a1f5f22a

drivers/gpio/vr41xx_giu.c

+24 −24
Original line number Diff line number Diff line
@@ -111,69 +111,69 @@ static inline u16 giu_clear(u16 offset, u16 clear) 
	return data;

}



static void ack_giuint_low(unsigned int irq)

static void ack_giuint_low(struct irq_data *d)

{

	giu_write(GIUINTSTATL, 1 << GPIO_PIN_OF_IRQ(irq));

	giu_write(GIUINTSTATL, 1 << GPIO_PIN_OF_IRQ(d->irq));

}



static void mask_giuint_low(unsigned int irq)

static void mask_giuint_low(struct irq_data *d)

{

	giu_clear(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(irq));

	giu_clear(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(d->irq));

}



static void mask_ack_giuint_low(unsigned int irq)

static void mask_ack_giuint_low(struct irq_data *d)

{

	unsigned int pin;



	pin = GPIO_PIN_OF_IRQ(irq);

	pin = GPIO_PIN_OF_IRQ(d->irq);

	giu_clear(GIUINTENL, 1 << pin);

	giu_write(GIUINTSTATL, 1 << pin);

}



static void unmask_giuint_low(unsigned int irq)

static void unmask_giuint_low(struct irq_data *d)

{

	giu_set(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(irq));

	giu_set(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(d->irq));

}



static struct irq_chip giuint_low_irq_chip = {

	.name		= "GIUINTL",

	.ack		= ack_giuint_low,

	.mask		= mask_giuint_low,

	.mask_ack	= mask_ack_giuint_low,

	.unmask		= unmask_giuint_low,

	.irq_ack	= ack_giuint_low,

	.irq_mask	= mask_giuint_low,

	.irq_mask_ack	= mask_ack_giuint_low,

	.irq_unmask	= unmask_giuint_low,

};



static void ack_giuint_high(unsigned int irq)

static void ack_giuint_high(struct irq_data *d)

{

	giu_write(GIUINTSTATH,

		  1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));

		  1 << (GPIO_PIN_OF_IRQ(d->irq) - GIUINT_HIGH_OFFSET));

}



static void mask_giuint_high(unsigned int irq)

static void mask_giuint_high(struct irq_data *d)

{

	giu_clear(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));

	giu_clear(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(d->irq) - GIUINT_HIGH_OFFSET));

}



static void mask_ack_giuint_high(unsigned int irq)

static void mask_ack_giuint_high(struct irq_data *d)

{

	unsigned int pin;



	pin = GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET;

	pin = GPIO_PIN_OF_IRQ(d->irq) - GIUINT_HIGH_OFFSET;

	giu_clear(GIUINTENH, 1 << pin);

	giu_write(GIUINTSTATH, 1 << pin);

}



static void unmask_giuint_high(unsigned int irq)

static void unmask_giuint_high(struct irq_data *d)

{

	giu_set(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));

	giu_set(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(d->irq) - GIUINT_HIGH_OFFSET));

}



static struct irq_chip giuint_high_irq_chip = {

	.name		= "GIUINTH",

	.ack		= ack_giuint_high,

	.mask		= mask_giuint_high,

	.mask_ack	= mask_ack_giuint_high,

	.unmask		= unmask_giuint_high,

	.irq_ack	= ack_giuint_high,

	.irq_mask	= mask_giuint_high,

	.irq_mask_ack	= mask_ack_giuint_high,

	.irq_unmask	= unmask_giuint_high,

};



static int giu_get_irq(unsigned int irq)