Messages in this thread Patch in this message |  | | | Date | Fri, 25 Mar 2011 11:12:27 -0000 | | From | Thomas Gleixner <> | | Subject | [patch 03/10] mfd: ezx-pcap: Remvove open coded irq handling |
| |
There is no point in checking irq_desc here, as it _is_ available. The driver configured those lines, so they cannot go away.
The home brewn disabled/note_interrupt magic can be removed as well by adding a irq_disable callback which avoids the lazy disable.
That driver needs to be converted to threaded interrupts.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- drivers/mfd/ezx-pcap.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) Index: linux-2.6-tip/drivers/mfd/ezx-pcap.c =================================================================== --- linux-2.6-tip.orig/drivers/mfd/ezx-pcap.c +++ linux-2.6-tip/drivers/mfd/ezx-pcap.c @@ -162,6 +162,7 @@ static void pcap_unmask_irq(struct irq_d static struct irq_chip pcap_irq_chip = { .name = "pcap", + .irq_disable = pcap_mask_irq, .irq_mask = pcap_mask_irq, .irq_unmask = pcap_unmask_irq, }; @@ -196,17 +197,8 @@ static void pcap_isr_work(struct work_st local_irq_disable(); service = isr & ~msr; for (irq = pcap->irq_base; service; service >>= 1, irq++) { - if (service & 1) { - struct irq_desc *desc = irq_to_desc(irq); - - if (WARN(!desc, "Invalid PCAP IRQ %d\n", irq)) - break; - - if (desc->status & IRQ_DISABLED) - note_interrupt(irq, desc, IRQ_NONE); - else - desc->handle_irq(irq, desc); - } + if (service & 1) + generic_handle_irq(irq); } local_irq_enable(); ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr);
|  |