Commit 02d00eaa authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner

genirq: Remove irq argument from report_bad_irq()

Not really a hotpath, so __report_bad_irq() can retrieve the irq
number from the irq descriptor.

[ tglx: Split out from combo patch ]
Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b80f5f3f
...@@ -188,10 +188,9 @@ static inline int bad_action_ret(irqreturn_t action_ret) ...@@ -188,10 +188,9 @@ static inline int bad_action_ret(irqreturn_t action_ret)
* (The other 100-of-100,000 interrupts may have been a correctly * (The other 100-of-100,000 interrupts may have been a correctly
* functioning device sharing an IRQ with the failing one) * functioning device sharing an IRQ with the failing one)
*/ */
static void static void __report_bad_irq(struct irq_desc *desc, irqreturn_t action_ret)
__report_bad_irq(unsigned int irq, struct irq_desc *desc,
irqreturn_t action_ret)
{ {
unsigned int irq = irq_desc_get_irq(desc);
struct irqaction *action; struct irqaction *action;
unsigned long flags; unsigned long flags;
...@@ -224,14 +223,13 @@ __report_bad_irq(unsigned int irq, struct irq_desc *desc, ...@@ -224,14 +223,13 @@ __report_bad_irq(unsigned int irq, struct irq_desc *desc,
raw_spin_unlock_irqrestore(&desc->lock, flags); raw_spin_unlock_irqrestore(&desc->lock, flags);
} }
static void static void report_bad_irq(struct irq_desc *desc, irqreturn_t action_ret)
report_bad_irq(unsigned int irq, struct irq_desc *desc, irqreturn_t action_ret)
{ {
static int count = 100; static int count = 100;
if (count > 0) { if (count > 0) {
count--; count--;
__report_bad_irq(irq, desc, action_ret); __report_bad_irq(desc, action_ret);
} }
} }
...@@ -280,7 +278,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc, ...@@ -280,7 +278,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
return; return;
if (bad_action_ret(action_ret)) { if (bad_action_ret(action_ret)) {
report_bad_irq(irq, desc, action_ret); report_bad_irq(desc, action_ret);
return; return;
} }
...@@ -413,7 +411,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc, ...@@ -413,7 +411,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
/* /*
* The interrupt is stuck * The interrupt is stuck
*/ */
__report_bad_irq(irq, desc, action_ret); __report_bad_irq(desc, action_ret);
/* /*
* Now kill the IRQ * Now kill the IRQ
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment