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>

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index b3986bce64ff..f3f36f6af9a1 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -223,7 +223,7 @@ void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend)
 
         if (!desc->depth++) {
                 desc->status |= IRQ_DISABLED;
-                desc->irq_data.chip->disable(irq);
+                desc->irq_data.chip->irq_disable(&desc->irq_data);
         }
 }
 
@@ -919,10 +919,10 @@ 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->shutdown)
-                        desc->irq_data.chip->shutdown(irq);
+                if (desc->irq_data.chip->irq_shutdown)
+                        desc->irq_data.chip->irq_shutdown(&desc->irq_data);
                 else
-                        desc->irq_data.chip->disable(irq);
+                        desc->irq_data.chip->irq_disable(&desc->irq_data);
         }
 
 #ifdef CONFIG_SMP