genirq: Move INPROGRESS, MASKED and DISABLED state flags to irq_data

We really need these flags for some of the interrupt chips. Move it
from internal state to irq_data and provide proper accessors.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: David Daney <ddaney@caviumnetworks.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index ec4806d4778b..5e81d34b08d6 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -66,7 +66,7 @@ void irq_move_irq(struct irq_data *idata)
         if (likely(!irqd_is_setaffinity_pending(idata)))
                 return;
 
-        if (unlikely(desc->istate & IRQS_DISABLED))
+        if (unlikely(irqd_irq_disabled(idata)))
                 return;
 
         /*
@@ -74,7 +74,7 @@ void irq_move_irq(struct irq_data *idata)
          * threaded interrupt with ONESHOT set, we can end up with an
          * interrupt storm.
          */
-        masked = desc->istate & IRQS_MASKED;
+        masked = irqd_irq_masked(idata);
         if (!masked)
                 idata->chip->irq_mask(idata);
         irq_move_masked_irq(idata);