diff options
Diffstat (limited to 'kernel/irq/spurious.c')
-rw-r--r-- | kernel/irq/spurious.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 417e98092cf2..543ea2e5ad93 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
@@ -16,7 +16,7 @@ static int irqfixup __read_mostly; | |||
16 | /* | 16 | /* |
17 | * Recovery handler for misrouted interrupts. | 17 | * Recovery handler for misrouted interrupts. |
18 | */ | 18 | */ |
19 | static int misrouted_irq(int irq, struct pt_regs *regs) | 19 | static int misrouted_irq(int irq) |
20 | { | 20 | { |
21 | int i; | 21 | int i; |
22 | int ok = 0; | 22 | int ok = 0; |
@@ -49,7 +49,7 @@ static int misrouted_irq(int irq, struct pt_regs *regs) | |||
49 | while (action) { | 49 | while (action) { |
50 | /* Only shared IRQ handlers are safe to call */ | 50 | /* Only shared IRQ handlers are safe to call */ |
51 | if (action->flags & IRQF_SHARED) { | 51 | if (action->flags & IRQF_SHARED) { |
52 | if (action->handler(i, action->dev_id, regs) == | 52 | if (action->handler(i, action->dev_id) == |
53 | IRQ_HANDLED) | 53 | IRQ_HANDLED) |
54 | ok = 1; | 54 | ok = 1; |
55 | } | 55 | } |
@@ -70,7 +70,7 @@ static int misrouted_irq(int irq, struct pt_regs *regs) | |||
70 | */ | 70 | */ |
71 | work = 1; | 71 | work = 1; |
72 | spin_unlock(&desc->lock); | 72 | spin_unlock(&desc->lock); |
73 | handle_IRQ_event(i, regs, action); | 73 | handle_IRQ_event(i, action); |
74 | spin_lock(&desc->lock); | 74 | spin_lock(&desc->lock); |
75 | desc->status &= ~IRQ_PENDING; | 75 | desc->status &= ~IRQ_PENDING; |
76 | } | 76 | } |
@@ -136,7 +136,7 @@ report_bad_irq(unsigned int irq, struct irq_desc *desc, irqreturn_t action_ret) | |||
136 | } | 136 | } |
137 | 137 | ||
138 | void note_interrupt(unsigned int irq, struct irq_desc *desc, | 138 | void note_interrupt(unsigned int irq, struct irq_desc *desc, |
139 | irqreturn_t action_ret, struct pt_regs *regs) | 139 | irqreturn_t action_ret) |
140 | { | 140 | { |
141 | if (unlikely(action_ret != IRQ_HANDLED)) { | 141 | if (unlikely(action_ret != IRQ_HANDLED)) { |
142 | desc->irqs_unhandled++; | 142 | desc->irqs_unhandled++; |
@@ -147,7 +147,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc, | |||
147 | if (unlikely(irqfixup)) { | 147 | if (unlikely(irqfixup)) { |
148 | /* Don't punish working computers */ | 148 | /* Don't punish working computers */ |
149 | if ((irqfixup == 2 && irq == 0) || action_ret == IRQ_NONE) { | 149 | if ((irqfixup == 2 && irq == 0) || action_ret == IRQ_NONE) { |
150 | int ok = misrouted_irq(irq, regs); | 150 | int ok = misrouted_irq(irq); |
151 | if (action_ret == IRQ_NONE) | 151 | if (action_ret == IRQ_NONE) |
152 | desc->irqs_unhandled -= ok; | 152 | desc->irqs_unhandled -= ok; |
153 | } | 153 | } |