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

Wrap the old chip function mask() 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: <20100927121841.940355859@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 77e551d92239d0b750aaf7b9f03a197733a5771c..c041270bfe50ad907ee2a9d05d4daf172b367843 100644 (file)
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -320,11 +320,16 @@ static void default_shutdown(unsigned int irq)
 {
        struct irq_desc *desc = irq_to_desc(irq);
 
-       desc->irq_data.chip->mask(irq);
+       desc->irq_data.chip->irq_mask(&desc->irq_data);
        desc->status |= IRQ_MASKED;
 }
 
 /* Temporary migration helpers */
+static void compat_irq_mask(struct irq_data *data)
+{
+       data->chip->mask(data->irq);
+}
+
 static void compat_bus_lock(struct irq_data *data)
 {
        data->chip->bus_lock(data->irq);
@@ -362,6 +367,9 @@ void irq_chip_set_defaults(struct irq_chip *chip)
                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;
 }
 
 static inline void mask_ack_irq(struct irq_desc *desc, int irq)
@@ -369,17 +377,17 @@ static inline void mask_ack_irq(struct irq_desc *desc, int irq)
        if (desc->irq_data.chip->mask_ack)
                desc->irq_data.chip->mask_ack(irq);
        else {
-               desc->irq_data.chip->mask(irq);
+               desc->irq_data.chip->irq_mask(&desc->irq_data);
                if (desc->irq_data.chip->ack)
                        desc->irq_data.chip->ack(irq);
        }
        desc->status |= IRQ_MASKED;
 }
 
-static inline void mask_irq(struct irq_desc *desc, int irq)
+static inline void mask_irq(struct irq_desc *desc)
 {
-       if (desc->irq_data.chip->mask) {
-               desc->irq_data.chip->mask(irq);
+       if (desc->irq_data.chip->irq_mask) {
+               desc->irq_data.chip->irq_mask(&desc->irq_data);
                desc->status |= IRQ_MASKED;
        }
 }
@@ -553,7 +561,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
        action = desc->action;
        if (unlikely(!action || (desc->status & IRQ_DISABLED))) {
                desc->status |= IRQ_PENDING;
-               mask_irq(desc, irq);
+               mask_irq(desc);
                goto out;
        }
 
@@ -621,7 +629,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
                irqreturn_t action_ret;
 
                if (unlikely(!action)) {
-                       mask_irq(desc, irq);
+                       mask_irq(desc);
                        goto out_unlock;
                }
 

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index adca5b4b40d8731f9ffad1c59e7655094613b275..3b160ac236b0349426ff4e244ffa43ffc48ced0a 100644 (file)
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -360,7 +360,6 @@ struct irq_chip dummy_irq_chip = {
        .enable         = compat_noop,
        .disable        = compat_noop,
        .ack            = compat_noop,
-       .mask           = compat_noop,
        .unmask         = compat_noop,
        .end            = compat_noop,
 };

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index f923c37e651a7900c90e36b0071dce87b45e49f2..b165ec26b757109571475dd36e86aa555b2364dd 100644 (file)
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -61,7 +61,7 @@ void move_native_irq(int irq)
        if (unlikely(desc->status & IRQ_DISABLED))
                return;
 
-       desc->irq_data.chip->mask(irq);
+       desc->irq_data.chip->irq_mask(&desc->irq_data);
        move_masked_irq(irq);
        desc->irq_data.chip->unmask(irq);
 }