diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-25 12:12:27 +0100 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-27 00:09:42 +0100 |
| commit | 73a6839fdb7f3f5ac7bfaee0796dd7647b9c9376 (patch) | |
| tree | 711fc01dce50f711c1a5d2d0a4f4e38cf094769d | |
| parent | mfd: 88pm860x: Remove unused irq_desc leftovers (diff) | |
| download | linux-73a6839fdb7f3f5ac7bfaee0796dd7647b9c9376.tar.xz linux-73a6839fdb7f3f5ac7bfaee0796dd7647b9c9376.zip | |
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>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | drivers/mfd/ezx-pcap.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index 9e2d8dd5f9e5..92e6fbc43a14 100644 --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c @@ -162,6 +162,7 @@ static void pcap_unmask_irq(struct irq_data *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_struct *work) 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); |