lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

genirq: Consolidate startup/shutdown of interrupts

Browse Source 
Aside of duplicated code some of the startup/shutdown sites do not
handle the MASKED/DISABLED flags and the depth field at all. Move that
to a helper function and take care of it there.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20110202212551.787481468@linutronix.de>
This commit is contained in:
Thomas Gleixner
2011-02-02 21:41:14 +00:00
parent 3b56f0585f
commit 4699923861
4 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/irq/manage.c
View File

@@ -906,11 +906,9 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
if (new->flags & IRQF_ONESHOT)
desc->status |= IRQ_ONESHOT;
if (!(desc->status & IRQ_NOAUTOEN)) {
desc->depth = 0;
desc->status &= ~IRQ_DISABLED;
desc->irq_data.chip->irq_startup(&desc->irq_data);
} else
if (!(desc->status & IRQ_NOAUTOEN))
irq_startup(desc);
else
/* Undo nested disables: */
desc->depth = 1;
@@ -1055,10 +1053,8 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
#endif
/* If this was the last handler, shut down the IRQ line: */
if (!desc->action) {
desc->status |= IRQ_DISABLED;
desc->irq_data.chip->irq_shutdown(&desc->irq_data);
}
if (!desc->action)
irq_shutdown(desc);
#ifdef CONFIG_SMP
/* make sure affinity_hint is cleaned up */