genirq: Provide compat handling for chip->enable()

Wrap the old chip function enable() 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.437159182@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 c8648a83b80aa0f619ce92c81f8b0dcfe27eb15f..a95b4783126980869f0543aee4d5b3aaa1f390a9 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -287,9 +287,9 @@ EXPORT_SYMBOL_GPL(set_irq_nested_thread);
 /*
  * default enable function
  */
-static void default_enable(unsigned int irq)
+static void default_enable(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_unmask(&desc->irq_data);
        desc->status &= ~IRQ_MASKED;
@@ -309,7 +309,7 @@ static unsigned int default_startup(unsigned int irq)
 {
        struct irq_desc *desc = irq_to_desc(irq);
 
-       desc->irq_data.chip->enable(irq);
+       desc->irq_data.chip->irq_enable(&desc->irq_data);
        return 0;
 }
 
@@ -350,6 +350,11 @@ static void compat_irq_eoi(struct irq_data *data)
        data->chip->eoi(data->irq);
 }
 
+static void compat_irq_enable(struct irq_data *data)
+{
+       data->chip->enable(data->irq);
+}
+
 static void compat_bus_lock(struct irq_data *data)
 {
        data->chip->bus_lock(data->irq);
@@ -365,8 +370,18 @@ static void compat_bus_sync_unlock(struct irq_data *data)
  */
 void irq_chip_set_defaults(struct irq_chip *chip)
 {
-       if (!chip->enable)
-               chip->enable = default_enable;
+       /*
+        * Compat fixup functions need to be before we set the
+        * defaults for enable/disable/startup/shutdown
+        */
+       if (chip->enable)
+               chip->irq_enable = compat_irq_enable;
+
+       /*
+        * The real defaults
+        */
+       if (!chip->irq_enable)
+               chip->irq_enable = default_enable;
        if (!chip->disable)
                chip->disable = default_disable;
        if (!chip->startup)

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 9ba7aece0e4dba40a7a3d808f9d73dae317dd54a..ac8c749dfee5846666cc5776afc2f010e34f5b78 100644 (file)
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -328,7 +328,6 @@ struct irq_chip no_irq_chip = {
        .irq_ack        = ack_bad,
        .startup        = compat_noop_ret,
        .shutdown       = compat_noop,
-       .enable         = compat_noop,
        .disable        = compat_noop,
        .end            = compat_noop,
 };
@@ -348,7 +347,6 @@ struct irq_chip dummy_irq_chip = {
        .irq_unmask     = noop,
        .startup        = compat_noop_ret,
        .shutdown       = compat_noop,
-       .enable         = compat_noop,
        .disable        = compat_noop,
        .end            = compat_noop,
 };

diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 47c56a097928352d1fa28593acaa8719dd634f83..a798a2328f8aaabc98ec81bc7cf7189d8a8d318d 100644 (file)
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -60,7 +60,7 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
        /*
         * Make sure the interrupt is enabled, before resending it:
         */
-       desc->irq_data.chip->enable(irq);
+       desc->irq_data.chip->irq_enable(&desc->irq_data);
 
        /*
         * We do not resend level type interrupts. Level type