Commit ac93cdbd authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

arm: at91: Cleanup irq chip 



Avoid the whole lazy disable dance in the demux handler by providing a
irq_disable() callback.

Use the proper accessor functions and tidy up gpio_irq_handler()

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 5093aec8

arch/arm/mach-at91/gpio.c

+9 −22
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ static int gpio_irq_type(struct irq_data *d, unsigned type) 


static struct irq_chip gpio_irqchip = {

	.name		= "GPIO",

	.irq_disable	= gpio_irq_mask,

	.irq_mask	= gpio_irq_mask,

	.irq_unmask	= gpio_irq_unmask,

	.irq_set_type	= gpio_irq_type,
@@ -384,16 +385,14 @@ static struct irq_chip gpio_irqchip = { 
static void gpio_irq_handler(unsigned irq, struct irq_desc *desc)

{

	unsigned	pin;

	struct irq_desc	*gpio;

	struct at91_gpio_chip *at91_gpio;

	void __iomem	*pio;

	struct irq_data *idata = irq_desc_get_irq_data(desc);

	struct irq_chip *chip = irq_data_get_irq_chip(idata);

	struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(idata);

	void __iomem	*pio = at91_gpio->regbase;

	u32		isr;



	at91_gpio = get_irq_chip_data(irq);

	pio = at91_gpio->regbase;



	/* temporarily mask (level sensitive) parent IRQ */

	desc->irq_data.chip->irq_ack(&desc->irq_data);

	chip->irq_ack(idata);

	for (;;) {

		/* Reading ISR acks pending (edge triggered) GPIO interrupts.

		 * When there none are pending, we're finished unless we need
@@ -409,27 +408,15 @@ static void gpio_irq_handler(unsigned irq, struct irq_desc *desc) 
		}



		pin = at91_gpio->chip.base;

		gpio = &irq_desc[pin];



		while (isr) {

			if (isr & 1) {

				if (unlikely(gpio->depth)) {

					/*

					 * The core ARM interrupt handler lazily disables IRQs so

					 * another IRQ must be generated before it actually gets

					 * here to be disabled on the GPIO controller.

					 */

					gpio_irq_mask(irq_get_irq_data(pin));

				}

				else

			if (isr & 1)

				generic_handle_irq(pin);

			}

			pin++;

			gpio++;

			isr >>= 1;

		}

	}

	desc->irq_data.chip->irq_unmask(&desc->irq_data);

	chip->irq_unmask(idata);

	/* now it may re-trigger */

}