Merge branch 'linus' into x86/kprobes

[~andy/linux] / kernel / irq / manage.c

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 469814e9b9ee630b5d3050293b87390c1762d603..77a51be360103c98c8ce3a165668ea423f69d119 100644 (file)
--- 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);