From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 10 Jul 2008 05:01:13 +0000 (+0200)
Subject: genirq: remove extraneous checks in manage.c
X-Git-Tag: v2.6.27-rc1~1082^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48627d8d23c34106c1365563604739a50343edaf;p=linux-2.6

genirq: remove extraneous checks in manage.c

In http://bugzilla.kernel.org/show_bug.cgi?id=9580 it was pointed out
that the desc->chip checks are extraneous. In fact these are left
overs from early development and can be removed safely.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 469814e9b9..77a51be360 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -377,7 +377,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
 
 		/* Setup the type (level, edge polarity) if configured: */
 		if (new->flags & IRQF_TRIGGER_MASK) {
-			if (desc->chip && desc->chip->set_type)
+			if (desc->chip->set_type)
 				desc->chip->set_type(irq,
 						new->flags & IRQF_TRIGGER_MASK);
 			else
@@ -387,8 +387,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
 				 */
 				printk(KERN_WARNING "No IRQF_TRIGGER set_type "
 				       "function for IRQ %d (%s)\n", irq,
-				       desc->chip ? desc->chip->name :
-				       "unknown");
+				       desc->chip->name);
 		} else
 			compat_irq_chip_set_default_handler(desc);