diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-02 21:41:12 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 12:58:10 +0100 |
| commit | 3b56f0585fd4c02d047dc406668cb40159b2d340 (patch) | |
| tree | 99ac7c86428aeeaf4d8af51aad5753ac2e6d3af6 /kernel/irq | |
| parent | 1535dfacbf21c4da1b73fcf07c39913da5bd5581 (diff) | |
| download | linux-3b56f0585fd4c02d047dc406668cb40159b2d340.tar.gz linux-3b56f0585fd4c02d047dc406668cb40159b2d340.tar.bz2 linux-3b56f0585fd4c02d047dc406668cb40159b2d340.zip | |
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>
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/manage.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 33a6ee0ac68f..30bc8de40905 100644 --- a/kernel/irq/manage.c +++ b/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 (!desc->action) { 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 |