From: Andrew Morton <akpm@linux-foundation.org>

be neater about it.

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/irq/resend.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

diff -puN kernel/irq/resend.c~genirq-temporary-fix-for-level-triggered-irq-resend-fix kernel/irq/resend.c
--- a/kernel/irq/resend.c~genirq-temporary-fix-for-level-triggered-irq-resend-fix
+++ a/kernel/irq/resend.c
@@ -66,10 +66,8 @@ void check_irq_resend(struct irq_desc *d
 	 * Temporary hack to figure out more about the problem, which
 	 * is causing the ancient network cards to die.
 	 */
-	if (desc->handle_irq != handle_edge_irq) {
-		WARN_ON_ONCE(1);
+	if (WARN_ON_ONCE(desc->handle_irq != handle_edge_irq))
 		return;
-	}
 
 	if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
 		desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
_