genirq: Do not fiddle with IRQ_MASKED in handle_edge_irq()

IRQ_MASKED is set in mask_ack_irq() anyway. Remove it from
handle_edge_irq() to allow simpler ab^HHreuse of that function.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20110202212551.918484270@linutronix.de>

diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 43c62ca68c11afd5b28244e087fcbbcf3c6fde1c..2c30b78445951f427641be5a54e346e466ec2b93 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -611,7 +611,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
        if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||
                    !desc->action)) {
                if (!irq_check_poll(desc)) {
-                       desc->status |= (IRQ_PENDING | IRQ_MASKED);
+                       desc->status |= IRQ_PENDING;
                        mask_ack_irq(desc);
                        goto out_unlock;
                }