aboutsummaryrefslogtreecommitdiff
path: root/kernel/irq/chip.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-09-27 12:45:02 +0000
committerThomas Gleixner <tglx@linutronix.de>2010-10-04 12:43:43 +0200
commitbc310dda41be6439364c8f3b9fe7c9d743d22b1c (patch)
tree86a8b4da3d9e81aad104b61023858813454b0f35 /kernel/irq/chip.c
parentc5f756344c390f629243b4a28c2bd198fdfd7ee9 (diff)
downloadlinux-stericsson-bc310dda41be6439364c8f3b9fe7c9d743d22b1c.tar.gz
genirq: Provide compat handling for chip->disable()/shutdown()
Wrap the old chip functions disable() and shutdown() until the migration is complete and the old chip functions are removed. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra <peterz@infradead.org> LKML-Reference: <20100927121842.532070631@linutronix.de> Reviewed-by: H. Peter Anvin <hpa@zytor.com> Reviewed-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r--kernel/irq/chip.c37
1 files changed, 27 insertions, 10 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index a95b47831269..b8a47f0a26cc 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -298,7 +298,7 @@ static void default_enable(struct irq_data *data)
/*
* default disable function
*/
-static void default_disable(unsigned int irq)
+static void default_disable(struct irq_data *data)
{
}
@@ -316,9 +316,9 @@ static unsigned int default_startup(unsigned int irq)
/*
* default shutdown function
*/
-static void default_shutdown(unsigned int irq)
+static void default_shutdown(struct irq_data *data)
{
- struct irq_desc *desc = irq_to_desc(irq);
+ struct irq_desc *desc = irq_data_to_desc(data);
desc->irq_data.chip->irq_mask(&desc->irq_data);
desc->status |= IRQ_MASKED;
@@ -355,6 +355,16 @@ static void compat_irq_enable(struct irq_data *data)
data->chip->enable(data->irq);
}
+static void compat_irq_disable(struct irq_data *data)
+{
+ data->chip->disable(data->irq);
+}
+
+static void compat_irq_shutdown(struct irq_data *data)
+{
+ data->chip->shutdown(data->irq);
+}
+
static void compat_bus_lock(struct irq_data *data)
{
data->chip->bus_lock(data->irq);
@@ -376,28 +386,35 @@ void irq_chip_set_defaults(struct irq_chip *chip)
*/
if (chip->enable)
chip->irq_enable = compat_irq_enable;
+ if (chip->disable)
+ chip->irq_disable = compat_irq_disable;
+ if (chip->shutdown)
+ chip->irq_shutdown = compat_irq_shutdown;
/*
* The real defaults
*/
if (!chip->irq_enable)
chip->irq_enable = default_enable;
- if (!chip->disable)
- chip->disable = default_disable;
+ if (!chip->irq_disable)
+ chip->irq_disable = default_disable;
if (!chip->startup)
chip->startup = default_startup;
/*
- * We use chip->disable, when the user provided its own. When
- * we have default_disable set for chip->disable, then we need
+ * We use chip->irq_disable, when the user provided its own. When
+ * we have default_disable set for chip->irq_disable, then we need
* to use default_shutdown, otherwise the irq line is not
* disabled on free_irq():
*/
- if (!chip->shutdown)
- chip->shutdown = chip->disable != default_disable ?
- chip->disable : default_shutdown;
+ if (!chip->irq_shutdown)
+ chip->irq_shutdown = chip->irq_disable != default_disable ?
+ chip->irq_disable : default_shutdown;
if (!chip->end)
chip->end = dummy_irq_chip.end;
+ /*
+ * Now fix up the remaining compat handlers
+ */
if (chip->bus_lock)
chip->irq_bus_lock = compat_bus_lock;
if (chip->bus_sync_unlock)