[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-3b56f0585fd4c02d047dc406668cb40159b2d340@git.kernel.org>
Date: Sat, 19 Feb 2011 12:22:05 GMT
From: tip-bot for Thomas Gleixner <tglx@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
peterz@...radead.org, tglx@...utronix.de
Subject: [tip:irq/core] genirq: Remove bogus conditional
Commit-ID: 3b56f0585fd4c02d047dc406668cb40159b2d340
Gitweb: http://git.kernel.org/tip/3b56f0585fd4c02d047dc406668cb40159b2d340
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Wed, 2 Feb 2011 21:41:12 +0000
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Sat, 19 Feb 2011 12:58:10 +0100
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@...utronix.de>
Cc: Peter Zijlstra <peterz@...radead.org>
LKML-Reference: <20110202212551.667607458@...utronix.de>
---
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 33a6ee0..30bc8de 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists