From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Use the accounting fields which got introduced for snity checking for
the various PM options.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
---
kernel/irq/pm.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
Index: linux/kernel/irq/pm.c
===================================================================
--- linux.orig/kernel/irq/pm.c
+++ linux/kernel/irq/pm.c
@@ -51,7 +51,7 @@ void irq_pm_remove_action(struct irq_des
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 *
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 ! */
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
