diff options
| author | Jan Beulich <jbeulich@novell.com> | 2007-02-16 10:28:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 17:14:00 +0100 |
| commit | 5575ddf75ca7e61d6f69b96368e03dd88edd4604 (patch) | |
| tree | 31226bbad6f6ff1cd2123570ef965a20682b8b52 /kernel/irq/chip.c | |
| parent | [PATCH] IRQ kernel-doc fixes (diff) | |
| download | linux-5575ddf75ca7e61d6f69b96368e03dd88edd4604.tar.xz linux-5575ddf75ca7e61d6f69b96368e03dd88edd4604.zip | |
[PATCH] small irq management simplification
Use mask_ack_irq() where possible.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/irq/chip.c')
| -rw-r--r-- | kernel/irq/chip.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index e6dc8b8839dd..0133f4f9e9f0 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -565,10 +565,8 @@ __set_irq_handler(unsigned int irq, irq_flow_handler_t handle, int is_chained, /* Uninstall? */ if (handle == handle_bad_irq) { - if (desc->chip != &no_irq_chip) { - desc->chip->mask(irq); - desc->chip->ack(irq); - } + if (desc->chip != &no_irq_chip) + mask_ack_irq(desc, irq); desc->status |= IRQ_DISABLED; desc->depth = 1; } |