genirq: Make use of pm misfeature accounting

Use the accounting fields which got introduced for snity checking for
the various PM options.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/kernel/irq/pm.c b/kernel/irq/pm.c
index 1b1b67a73218d58c5538e5d6129173fdf4f86751..74ca6bb541d5665b5d6bb3fcef15f6910d9eb969 100644 (file)
--- a/kernel/irq/pm.c
+++ b/kernel/irq/pm.c
@@ -51,7 +51,7 @@ void irq_pm_remove_action(struct irq_desc *desc, struct irqaction *action)
 
 static void suspend_device_irq(struct irq_desc *desc, int irq)
 {
-       if (!desc->action || (desc->action->flags & IRQF_NO_SUSPEND))
+       if (!desc->action || desc->no_suspend_depth)
                return;
 
        desc->istate |= IRQS_SUSPENDED;
@@ -94,11 +94,8 @@ static void resume_irq(struct irq_desc *desc, int irq)
        if (desc->istate & IRQS_SUSPENDED)
                goto resume;
 
-       if (!desc->action)
-               return;
-
-       /* Interrupts marked with that flag are force reenabled */
-       if (!(desc->action->flags & IRQF_FORCE_RESUME))
+       /* Force resume the interrupt? */
+       if (!desc->force_resume_depth)
                return;
 
        /* Pretend that it got disabled ! */