Browse Source

genirq: Remove bogus conditional

The if (chip->irq_shutdown) check will always evaluate to true, as we
fill in chip->irq_shutdown with default_shutdown in
irq_chip_set_defaults() if the chip does not provide its own function.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20110202212551.667607458@linutronix.de>
Thomas Gleixner 14 years ago
parent
commit
3b56f0585f
1 changed files with 1 additions and 4 deletions
  1. 1 4
      kernel/irq/manage.c

+ 1 - 4
kernel/irq/manage.c

@@ -1057,10 +1057,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)
 	/* If this was the last handler, shut down the IRQ line: */
 	/* If this was the last handler, shut down the IRQ line: */
 	if (!desc->action) {
 	if (!desc->action) {
 		desc->status |= IRQ_DISABLED;
 		desc->status |= IRQ_DISABLED;
-		if (desc->irq_data.chip->irq_shutdown)
-			desc->irq_data.chip->irq_shutdown(&desc->irq_data);
-		else
-			desc->irq_data.chip->irq_disable(&desc->irq_data);
+		desc->irq_data.chip->irq_shutdown(&desc->irq_data);
 	}
 	}
 
 
 #ifdef CONFIG_SMP
 #ifdef CONFIG_SMP