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

Commit 664399e1 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Wrap calls to descriptor handlers 



This is part of Thomas Gleixner's generic IRQ patch, which converts
ARM to use the generic IRQ subsystem.  Here, we wrap calls to
desc->handler() in an inline function, desc_handle_irq().  This
reduces the size of Thomas' patch since the changes become more
localised.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7801907b

arch/arm/common/locomo.c

+5 −5
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static void locomo_handler(unsigned int irq, struct irqdesc *desc, 
		d = irq_desc + irq;

		for (i = 0; i <= 3; i++, d++, irq++) {

			if (req & (0x0100 << i)) {

				d->handle(irq, d, regs);

				desc_handle_irq(irq, d, regs);

			}



		}
@@ -220,7 +220,7 @@ static void locomo_key_handler(unsigned int irq, struct irqdesc *desc, 


	if (locomo_readl(mapbase + LOCOMO_KEYBOARD + LOCOMO_KIC) & 0x0001) {

		d = irq_desc + LOCOMO_IRQ_KEY_START;

		d->handle(LOCOMO_IRQ_KEY_START, d, regs);

		desc_handle_irq(LOCOMO_IRQ_KEY_START, d, regs);

	}

}
@@ -273,7 +273,7 @@ static void locomo_gpio_handler(unsigned int irq, struct irqdesc *desc, 
		d = irq_desc + LOCOMO_IRQ_GPIO_START;

		for (i = 0; i <= 15; i++, irq++, d++) {

			if (req & (0x0001 << i)) {

				d->handle(irq, d, regs);

				desc_handle_irq(irq, d, regs);

			}

		}

	}
@@ -328,7 +328,7 @@ static void locomo_lt_handler(unsigned int irq, struct irqdesc *desc, 


	if (locomo_readl(mapbase + LOCOMO_LTINT) & 0x0001) {

		d = irq_desc + LOCOMO_IRQ_LT_START;

		d->handle(LOCOMO_IRQ_LT_START, d, regs);

		desc_handle_irq(LOCOMO_IRQ_LT_START, d, regs);

	}

}
@@ -379,7 +379,7 @@ static void locomo_spi_handler(unsigned int irq, struct irqdesc *desc, 


		for (i = 0; i <= 3; i++, irq++, d++) {

			if (req & (0x0001 << i)) {

				d->handle(irq, d, regs);

				desc_handle_irq(irq, d, regs);

			}

		}

	}

arch/arm/kernel/ecard.c

+2 −2
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ ecard_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) 


		if (pending) {

			struct irqdesc *d = irq_desc + ec->irq;

			d->handle(ec->irq, d, regs);

			desc_handle_irq(ec->irq, d, regs);

			called ++;

		}

	}
@@ -632,7 +632,7 @@ ecard_irqexp_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *reg 
			 * Serial cards should go in 0/1, ethernet/scsi in 2/3

			 * otherwise you will lose serial data at high speeds!

			 */

			d->handle(ec->irq, d, regs);

			desc_handle_irq(ec->irq, d, regs);

		} else {

			printk(KERN_WARNING "card%d: interrupt from unclaimed "

			       "card???\n", slot);

arch/arm/kernel/irq.c

+2 −2
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ static void do_pending_irqs(struct pt_regs *regs) 
		list_for_each_safe(l, n, &head) {

			desc = list_entry(l, struct irqdesc, pend);

			list_del_init(&desc->pend);

			desc->handle(desc - irq_desc, desc, regs);

			desc_handle_irq(desc - irq_desc, desc, regs);

		}



		/*
@@ -545,7 +545,7 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs) 


	irq_enter();

	spin_lock(&irq_controller_lock);

	desc->handle(irq, desc, regs);

	desc_handle_irq(irq, desc, regs);



	/*

	 * Now re-run any pending interrupts.

arch/arm/mach-footbridge/isa-irq.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ isa_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) 
	}



	desc = irq_desc + isa_irq;

	desc->handle(isa_irq, desc, regs);

	desc_handle_irq(isa_irq, desc, regs);

}



static struct irqaction irq_cascade = { .handler = no_action, .name = "cascade", };

arch/arm/mach-h720x/common.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ h720x_gpio_handler(unsigned int mask, unsigned int irq, 
	while (mask) {

		if (mask & 1) {

			IRQDBG("handling irq %d\n", irq);

			desc->handle(irq, desc, regs);

			desc_handle_irq(irq, desc, regs);

		}

		irq++;

		desc++;