genirq: Remove irq argument from __enable/__disable_irq()
Solely used for debug output. Can be retrieved from irq descriptor if necessary. [ tglx: Split out from combo patch ] Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:

committed by
Thomas Gleixner

orang tua
a1ff541a40
melakukan
79ff1cda32
@@ -423,7 +423,7 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)
|
||||
}
|
||||
#endif
|
||||
|
||||
void __disable_irq(struct irq_desc *desc, unsigned int irq)
|
||||
void __disable_irq(struct irq_desc *desc)
|
||||
{
|
||||
if (!desc->depth++)
|
||||
irq_disable(desc);
|
||||
@@ -436,7 +436,7 @@ static int __disable_irq_nosync(unsigned int irq)
|
||||
|
||||
if (!desc)
|
||||
return -EINVAL;
|
||||
__disable_irq(desc, irq);
|
||||
__disable_irq(desc);
|
||||
irq_put_desc_busunlock(desc, flags);
|
||||
return 0;
|
||||
}
|
||||
@@ -503,12 +503,13 @@ bool disable_hardirq(unsigned int irq)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(disable_hardirq);
|
||||
|
||||
void __enable_irq(struct irq_desc *desc, unsigned int irq)
|
||||
void __enable_irq(struct irq_desc *desc)
|
||||
{
|
||||
switch (desc->depth) {
|
||||
case 0:
|
||||
err_out:
|
||||
WARN(1, KERN_WARNING "Unbalanced enable for IRQ %d\n", irq);
|
||||
WARN(1, KERN_WARNING "Unbalanced enable for IRQ %d\n",
|
||||
irq_desc_get_irq(desc));
|
||||
break;
|
||||
case 1: {
|
||||
if (desc->istate & IRQS_SUSPENDED)
|
||||
@@ -546,7 +547,7 @@ void enable_irq(unsigned int irq)
|
||||
KERN_ERR "enable_irq before setup/request_irq: irq %u\n", irq))
|
||||
goto out;
|
||||
|
||||
__enable_irq(desc, irq);
|
||||
__enable_irq(desc);
|
||||
out:
|
||||
irq_put_desc_busunlock(desc, flags);
|
||||
}
|
||||
@@ -1280,7 +1281,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
|
||||
*/
|
||||
if (shared && (desc->istate & IRQS_SPURIOUS_DISABLED)) {
|
||||
desc->istate &= ~IRQS_SPURIOUS_DISABLED;
|
||||
__enable_irq(desc, irq);
|
||||
__enable_irq(desc);
|
||||
}
|
||||
|
||||
raw_spin_unlock_irqrestore(&desc->lock, flags);
|
||||
|
Reference in New Issue
Block a user