lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

genirq: Consolidate IRQ_DISABLED

Browse Source 
Handle IRQ_DISABLED consistent.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2011-02-04 10:17:52 +01:00
parent 50f7c03275
commit 3aae994fb0
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/irq/manage.c
View File

@ -329,10 +329,8 @@ void __disable_irq(struct irq_desc *desc, unsigned int irq, bool suspend)
desc->status |= IRQ_SUSPENDED;
}
if (!desc->depth++) {
desc->status |= IRQ_DISABLED;
if (!desc->depth++)
irq_disable(desc);
}
}
/**
@ -407,12 +405,11 @@ void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume)
WARN(1, KERN_WARNING "Unbalanced enable for IRQ %d\n", irq);
break;
case 1: {
unsigned int status = desc->status & ~IRQ_DISABLED;
if (desc->status & IRQ_SUSPENDED)
goto err_out;
/* Prevent probing on this irq: */
desc->status = status | IRQ_NOPROBE;
desc->status |= IRQ_NOPROBE;
irq_enable(desc);
check_irq_resend(desc, irq);
/* fall-through */
}