From: Jan Beulich <jbeulich@novell.com>
Date: Fri, 16 Feb 2007 09:28:26 +0000 (-0800)
Subject: [PATCH] small irq management simplification
X-Git-Tag: v3.12-rc1~31538
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5575ddf75ca7e61d6f69b96368e03dd88edd4604;p=kernel%2Fkernel-generic.git

[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>
---

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index e6dc8b8..0133f4f 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;
 	}