Messages in this thread Patch in this message | | | Date | Wed, 17 May 2006 02:17:30 +0200 | From | Ingo Molnar <> | Subject | [patch 29/50] genirq: ARM: Convert ecard driver to generic irq handling |
| |
From: Thomas Gleixner <tglx@linutronix.de>
Fixup the conversion to generic irq subsystem.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- arch/arm/kernel/ecard.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Index: linux-genirq.q/arch/arm/kernel/ecard.c =================================================================== --- linux-genirq.q.orig/arch/arm/kernel/ecard.c +++ linux-genirq.q/arch/arm/kernel/ecard.c @@ -549,7 +549,7 @@ static void ecard_check_lockup(struct ir printk(KERN_ERR "\nInterrupt lockup detected - " "disabling all expansion card interrupts\n"); - desc->chip->mask(IRQ_EXPANSIONCARD); + desc->handler->mask(IRQ_EXPANSIONCARD); ecard_dump_irq_state(); } } else @@ -572,7 +572,7 @@ ecard_irq_handler(unsigned int irq, stru ecard_t *ec; int called = 0; - desc->chip->mask(irq); + desc->handler->mask(irq); for (ec = cards; ec; ec = ec->next) { int pending; @@ -590,7 +590,7 @@ ecard_irq_handler(unsigned int irq, stru called ++; } } - desc->chip->unmask(irq); + desc->handler->unmask(irq); if (called == 0) ecard_check_lockup(desc); @@ -620,7 +620,7 @@ ecard_irqexp_handler(unsigned int irq, s ecard_t *ec = slot_to_ecard(slot); if (ec->claimed) { - struct irqdesc *d = irqdesc + ec->irq; + struct irq_desc *d = irq_desc + ec->irq; /* * this ugly code is so that we can operate a * prioritorising system: - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |