mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
[PATCH] powerpc: irq change build breaks
Fix up some of the buildbreaks from the irq handler changes. Signed-off-by: Olof Johansson <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
44aefd2706
commit
49f19ce401
10 changed files with 12 additions and 12 deletions
|
|
@ -72,7 +72,7 @@ static void cpm2_cascade(unsigned int irq, struct irq_desc *desc,
|
|||
int cascade_irq;
|
||||
|
||||
while ((cascade_irq = cpm2_get_irq(regs)) >= 0) {
|
||||
generic_handle_irq(cascade_irq, regs);
|
||||
generic_handle_irq(cascade_irq);
|
||||
}
|
||||
desc->chip->eoi(irq);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ static void mpc85xx_8259_cascade(unsigned int irq, struct
|
|||
unsigned int cascade_irq = i8259_irq(regs);
|
||||
|
||||
if (cascade_irq != NO_IRQ)
|
||||
generic_handle_irq(cascade_irq, regs);
|
||||
generic_handle_irq(cascade_irq);
|
||||
|
||||
desc->chip->eoi(irq);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc,
|
|||
{
|
||||
unsigned int cascade_irq = i8259_irq(regs);
|
||||
if (cascade_irq != NO_IRQ)
|
||||
generic_handle_irq(cascade_irq, regs);
|
||||
generic_handle_irq(cascade_irq);
|
||||
desc->chip->eoi(irq);
|
||||
}
|
||||
#endif /* CONFIG_PCI */
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc,
|
|||
irq_linear_revmap(iic_host,
|
||||
base | cascade);
|
||||
if (cirq != NO_IRQ)
|
||||
generic_handle_irq(cirq, regs);
|
||||
generic_handle_irq(cirq);
|
||||
}
|
||||
/* post-ack level interrupts */
|
||||
ack = bits & ~IIC_ISR_EDGE_MASK;
|
||||
|
|
|
|||
|
|
@ -340,7 +340,7 @@ static void chrp_8259_cascade(unsigned int irq, struct irq_desc *desc,
|
|||
{
|
||||
unsigned int cascade_irq = i8259_irq(regs);
|
||||
if (cascade_irq != NO_IRQ)
|
||||
generic_handle_irq(cascade_irq, regs);
|
||||
generic_handle_irq(cascade_irq);
|
||||
desc->chip->eoi(irq);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ static irqreturn_t gatwick_action(int cpl, void *dev_id, struct pt_regs *regs)
|
|||
continue;
|
||||
irq += __ilog2(bits);
|
||||
spin_unlock_irqrestore(&pmac_pic_lock, flags);
|
||||
__do_IRQ(irq, regs);
|
||||
__do_IRQ(irq);
|
||||
spin_lock_irqsave(&pmac_pic_lock, flags);
|
||||
rc = IRQ_HANDLED;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -343,7 +343,7 @@ void fastcall qe_ic_cascade_low(unsigned int irq, struct irq_desc *desc,
|
|||
|
||||
chip->mask_ack(irq);
|
||||
if (cascade_irq != NO_IRQ)
|
||||
generic_handle_irq(cascade_irq, regs);
|
||||
generic_handle_irq(cascade_irq);
|
||||
chip->unmask(irq);
|
||||
}
|
||||
|
||||
|
|
@ -359,7 +359,7 @@ void fastcall qe_ic_cascade_high(unsigned int irq, struct irq_desc *desc,
|
|||
|
||||
chip->mask_ack(irq);
|
||||
if (cascade_irq != NO_IRQ)
|
||||
generic_handle_irq(cascade_irq, regs);
|
||||
generic_handle_irq(cascade_irq);
|
||||
chip->unmask(irq);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -410,6 +410,6 @@ void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc,
|
|||
{
|
||||
unsigned int cascade_irq = get_pci_source();
|
||||
if (cascade_irq != NO_IRQ)
|
||||
generic_handle_irq(cascade_irq, regs);
|
||||
generic_handle_irq(cascade_irq);
|
||||
desc->chip->eoi(irq);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue