aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2007-02-16 04:28:26 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-16 11:14:00 -0500
commit5575ddf75ca7e61d6f69b96368e03dd88edd4604 (patch)
tree31226bbad6f6ff1cd2123570ef965a20682b8b52
parent472900b8b02bf3782b06dcf0acdef26811c2b995 (diff)
[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>
-rw-r--r--kernel/irq/chip.c6
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,
565 565
566 /* Uninstall? */ 566 /* Uninstall? */
567 if (handle == handle_bad_irq) { 567 if (handle == handle_bad_irq) {
568 if (desc->chip != &no_irq_chip) { 568 if (desc->chip != &no_irq_chip)
569 desc->chip->mask(irq); 569 mask_ack_irq(desc, irq);
570 desc->chip->ack(irq);
571 }
572 desc->status |= IRQ_DISABLED; 570 desc->status |= IRQ_DISABLED;
573 desc->depth = 1; 571 desc->depth = 1;
574 } 572 }