genirq: Implement irq_data based move_*_irq() versions

No need to lookup the irq descriptor when calling from a chip callback
function which has irq_data already handy.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/linux/irq.h b/include/linux/irq.h
index ea2970c294aaf3a84702213b9bb2e08ee9e08334..ff62d0145b8fb131d58a10812f82005f242e89e5 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -363,9 +363,13 @@ extern void remove_irq(unsigned int irq, struct irqaction *act);
 #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_PENDING_IRQ)
 void move_native_irq(int irq);
 void move_masked_irq(int irq);
+void irq_move_irq(struct irq_data *data);
+void irq_move_masked_irq(struct irq_data *data);
 #else
 static inline void move_native_irq(int irq) { }
 static inline void move_masked_irq(int irq) { }
+static inline void irq_move_irq(struct irq_data *data) { }
+static inline void irq_move_masked_irq(struct irq_data *data) { }
 #endif
 
 extern int no_irq_affinity;

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 7a93c6b88b2550353f20393b7c30d1040e181a20..ec4806d4778b2143c03f94c1d067f56647928e06 100644 (file)
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -4,10 +4,10 @@
 
 #include "internals.h"
 
-void move_masked_irq(int irq)
+void irq_move_masked_irq(struct irq_data *idata)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
-       struct irq_chip *chip = desc->irq_data.chip;
+       struct irq_desc *desc = irq_data_to_desc(idata);
+       struct irq_chip *chip = idata->chip;
 
        if (likely(!irqd_is_setaffinity_pending(&desc->irq_data)))
                return;
@@ -53,12 +53,17 @@ void move_masked_irq(int irq)
        cpumask_clear(desc->pending_mask);
 }
 
-void move_native_irq(int irq)
+void move_masked_irq(int irq)
+{
+       irq_move_masked_irq(irq_get_irq_data(irq));
+}
+
+void irq_move_irq(struct irq_data *idata)
 {
-       struct irq_desc *desc = irq_to_desc(irq);
+       struct irq_desc *desc = irq_data_to_desc(idata);
        bool masked;
 
-       if (likely(!irqd_is_setaffinity_pending(&desc->irq_data)))
+       if (likely(!irqd_is_setaffinity_pending(idata)))
                return;
 
        if (unlikely(desc->istate & IRQS_DISABLED))
@@ -71,8 +76,13 @@ void move_native_irq(int irq)
         */
        masked = desc->istate & IRQS_MASKED;
        if (!masked)
-               desc->irq_data.chip->irq_mask(&desc->irq_data);
-       move_masked_irq(irq);
+               idata->chip->irq_mask(idata);
+       irq_move_masked_irq(idata);
        if (!masked)
-               desc->irq_data.chip->irq_unmask(&desc->irq_data);
+               idata->chip->irq_unmask(idata);
+}
+
+void move_native_irq(int irq)
+{
+       irq_move_irq(irq_get_irq_data(irq));
 }