diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-03 12:27:44 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 12:58:10 +0100 |
| commit | 87923470c712dff00b101ffb6b6fbc27bd7a6df5 (patch) | |
| tree | 35dc1a0adec4d00bbc872ce096c481cf0d69314a /kernel/irq/resend.c | |
| parent | 4699923861513671d3f6ade8efb4e56a9a7ecadf (diff) | |
| download | lwn-87923470c712dff00b101ffb6b6fbc27bd7a6df5.tar.gz lwn-87923470c712dff00b101ffb6b6fbc27bd7a6df5.zip | |
genirq: Consolidate disable/enable
Create irq_disable/enable and use them to keep the flags consistent.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/resend.c')
| -rw-r--r-- | kernel/irq/resend.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c index dc49358b73fa..4bfe268dffe5 100644 --- a/kernel/irq/resend.c +++ b/kernel/irq/resend.c @@ -55,20 +55,20 @@ static DECLARE_TASKLET(resend_tasklet, resend_irqs, 0); */ void check_irq_resend(struct irq_desc *desc, unsigned int irq) { - unsigned int status = desc->status; - /* * Make sure the interrupt is enabled, before resending it: */ - desc->irq_data.chip->irq_enable(&desc->irq_data); + irq_enable(desc); /* * We do not resend level type interrupts. Level type * interrupts are resent by hardware when they are still * active. */ - if ((status & (IRQ_LEVEL | IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) { - desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY; + if (desc->status & IRQ_LEVEL) + return; + if ((desc->status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) { + desc->status = (desc->status & ~IRQ_PENDING) | IRQ_REPLAY; if (!desc->irq_data.chip->irq_retrigger || !desc->irq_data.chip->irq_retrigger(&desc->irq_data)) { |