diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-02 16:41:12 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:10 -0500 |
commit | 3b56f0585fd4c02d047dc406668cb40159b2d340 (patch) | |
tree | 99ac7c86428aeeaf4d8af51aad5753ac2e6d3af6 /kernel/irq/manage.c | |
parent | 1535dfacbf21c4da1b73fcf07c39913da5bd5581 (diff) |
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/manage.c')
-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) | |||
1057 | /* If this was the last handler, shut down the IRQ line: */ | 1057 | /* If this was the last handler, shut down the IRQ line: */ |
1058 | if (!desc->action) { | 1058 | if (!desc->action) { |
1059 | desc->status |= IRQ_DISABLED; | 1059 | desc->status |= IRQ_DISABLED; |
1060 | if (desc->irq_data.chip->irq_shutdown) | 1060 | desc->irq_data.chip->irq_shutdown(&desc->irq_data); |
1061 | desc->irq_data.chip->irq_shutdown(&desc->irq_data); | ||
1062 | else | ||
1063 | desc->irq_data.chip->irq_disable(&desc->irq_data); | ||
1064 | } | 1061 | } |
1065 | 1062 | ||
1066 | #ifdef CONFIG_SMP | 1063 | #ifdef CONFIG_SMP |