genirq: Provide compat handling for chip->ack()
Wrap the old chip function ack() 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.142624725@linutronix.de>
Reviewed-by: H. Peter Anvin <hpa@zytor.com>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index dbdb59a..864c3ab 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -335,6 +335,11 @@
data->chip->unmask(data->irq);
}
+static void compat_irq_ack(struct irq_data *data)
+{
+ data->chip->ack(data->irq);
+}
+
static void compat_bus_lock(struct irq_data *data)
{
data->chip->bus_lock(data->irq);
@@ -372,12 +377,12 @@
chip->irq_bus_lock = compat_bus_lock;
if (chip->bus_sync_unlock)
chip->irq_bus_sync_unlock = compat_bus_sync_unlock;
-
if (chip->mask)
chip->irq_mask = compat_irq_mask;
-
if (chip->unmask)
chip->irq_unmask = compat_irq_unmask;
+ if (chip->ack)
+ chip->irq_ack = compat_irq_ack;
}
static inline void mask_ack_irq(struct irq_desc *desc, int irq)
@@ -386,8 +391,8 @@
desc->irq_data.chip->mask_ack(irq);
else {
desc->irq_data.chip->irq_mask(&desc->irq_data);
- if (desc->irq_data.chip->ack)
- desc->irq_data.chip->ack(irq);
+ if (desc->irq_data.chip->irq_ack)
+ desc->irq_data.chip->irq_ack(&desc->irq_data);
}
desc->status |= IRQ_MASKED;
}
@@ -626,8 +631,7 @@
kstat_incr_irqs_this_cpu(irq, desc);
/* Start handling the irq */
- if (desc->irq_data.chip->ack)
- desc->irq_data.chip->ack(irq);
+ desc->irq_data.chip->irq_ack(&desc->irq_data);
/* Mark the IRQ currently in progress.*/
desc->status |= IRQ_INPROGRESS;
@@ -680,8 +684,8 @@
kstat_incr_irqs_this_cpu(irq, desc);
- if (desc->irq_data.chip->ack)
- desc->irq_data.chip->ack(irq);
+ if (desc->irq_data.chip->irq_ack)
+ desc->irq_data.chip->irq_ack(&desc->irq_data);
action_ret = handle_IRQ_event(irq, desc->action);
if (!noirqdebug)