Commit 49f19ce4 authored by Olof Johansson's avatar Olof Johansson Committed by Linus Torvalds

[PATCH] powerpc: irq change build breaks

Fix up some of the buildbreaks from the irq handler changes.
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 44aefd27
......@@ -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);
}
......@@ -437,7 +437,7 @@ cuda_poll(void)
* disable_irq(), would that work on m68k ? --BenH
*/
local_irq_save(flags);
cuda_interrupt(0, NULL, NULL);
cuda_interrupt(0, NULL);
local_irq_restore(flags);
}
......
......@@ -465,7 +465,7 @@ tas_dmasound_init(void)
val = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio_headphone_detect, 0);
pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, gpio_headphone_detect, val | 0x80);
/* Trigger it */
headphone_intr(0,NULL,NULL);
headphone_intr(0, NULL);
}
}
if (!gpio_headphone_irq) {
......@@ -1499,7 +1499,7 @@ static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when)
write_audio_gpio(gpio_audio_reset, !gpio_audio_reset_pol);
msleep(150);
tas_leave_sleep(); /* Stub for now */
headphone_intr(0,NULL,NULL);
headphone_intr(0, NULL);
break;
case AWACS_DACA:
msleep(10); /* Check this !!! */
......
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