Skip to content

Commit

Permalink
mfd: ezx-pcap: Remvove open coded irq handling
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Gleixner authored and Samuel Ortiz committed Mar 26, 2011
1 parent 256d0e2 commit 73a6839
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions drivers/mfd/ezx-pcap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 73a6839

Please sign in to comment.