samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] powerpc: irq change build breaks

Browse Source 
Fix up some of the buildbreaks from the irq handler changes.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Olof Johansson
2006-10-05 20:31:10 -05:00
committed by Linus Torvalds
parent 44aefd2706
commit 49f19ce401
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/platforms/85xx/mpc85xx_ads.c
View File

@@ -72,7 +72,7 @@ static void cpm2_cascade(unsigned int irq, struct irq_desc *desc,
int cascade_irq; int cascade_irq;
while ((cascade_irq = cpm2_get_irq(regs)) >= 0) { while ((cascade_irq = cpm2_get_irq(regs)) >= 0) {
generic_handle_irq(cascade_irq, regs); generic_handle_irq(cascade_irq);
} }
desc->chip->eoi(irq); desc->chip->eoi(irq);
} }

2
arch/powerpc/platforms/85xx/mpc85xx_cds.c
View File

@@ -138,7 +138,7 @@ static void mpc85xx_8259_cascade(unsigned int irq, struct
unsigned int cascade_irq = i8259_irq(regs); unsigned int cascade_irq = i8259_irq(regs);
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
generic_handle_irq(cascade_irq, regs); generic_handle_irq(cascade_irq);
desc->chip->eoi(irq); desc->chip->eoi(irq);
} }

2
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
View File

@@ -58,7 +58,7 @@ static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc,
{ {
unsigned int cascade_irq = i8259_irq(regs); unsigned int cascade_irq = i8259_irq(regs);
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
generic_handle_irq(cascade_irq, regs); generic_handle_irq(cascade_irq);
desc->chip->eoi(irq); desc->chip->eoi(irq);
} }
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */

2
arch/powerpc/platforms/cell/interrupt.c
View File

@@ -121,7 +121,7 @@ static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc,
irq_linear_revmap(iic_host, irq_linear_revmap(iic_host,
base | cascade); base | cascade);
if (cirq != NO_IRQ) if (cirq != NO_IRQ)
generic_handle_irq(cirq, regs); generic_handle_irq(cirq);
} }
/* post-ack level interrupts */ /* post-ack level interrupts */
ack = bits & ~IIC_ISR_EDGE_MASK; ack = bits & ~IIC_ISR_EDGE_MASK;

2
arch/powerpc/platforms/chrp/setup.c
View File

@@ -340,7 +340,7 @@ static void chrp_8259_cascade(unsigned int irq, struct irq_desc *desc,
{ {
unsigned int cascade_irq = i8259_irq(regs); unsigned int cascade_irq = i8259_irq(regs);
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
generic_handle_irq(cascade_irq, regs); generic_handle_irq(cascade_irq);
desc->chip->eoi(irq); desc->chip->eoi(irq);
} }

2
arch/powerpc/platforms/powermac/pic.c
View File

@@ -227,7 +227,7 @@ static irqreturn_t gatwick_action(int cpl, void *dev_id, struct pt_regs *regs)
continue; continue;
irq += __ilog2(bits); irq += __ilog2(bits);
spin_unlock_irqrestore(&pmac_pic_lock, flags); spin_unlock_irqrestore(&pmac_pic_lock, flags);
__do_IRQ(irq, regs); __do_IRQ(irq);
spin_lock_irqsave(&pmac_pic_lock, flags); spin_lock_irqsave(&pmac_pic_lock, flags);
rc = IRQ_HANDLED; rc = IRQ_HANDLED;
} }

4
arch/powerpc/sysdev/qe_lib/qe_ic.c
View File

@@ -343,7 +343,7 @@ void fastcall qe_ic_cascade_low(unsigned int irq, struct irq_desc *desc,
chip->mask_ack(irq); chip->mask_ack(irq);
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
generic_handle_irq(cascade_irq, regs); generic_handle_irq(cascade_irq);
chip->unmask(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); chip->mask_ack(irq);
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
generic_handle_irq(cascade_irq, regs); generic_handle_irq(cascade_irq);
chip->unmask(irq); chip->unmask(irq);
} }

2
arch/powerpc/sysdev/tsi108_pci.c
View File

@@ -410,6 +410,6 @@ void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc,
{ {
unsigned int cascade_irq = get_pci_source(); unsigned int cascade_irq = get_pci_source();
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
generic_handle_irq(cascade_irq, regs); generic_handle_irq(cascade_irq);
desc->chip->eoi(irq); desc->chip->eoi(irq);
} }

2
drivers/macintosh/via-cuda.c
View File

@@ -437,7 +437,7 @@ cuda_poll(void)
* disable_irq(), would that work on m68k ? --BenH * disable_irq(), would that work on m68k ? --BenH
*/ */
local_irq_save(flags); local_irq_save(flags);
cuda_interrupt(0, NULL, NULL); cuda_interrupt(0, NULL);
local_irq_restore(flags); local_irq_restore(flags);
} }

4
sound/oss/dmasound/dmasound_awacs.c
View File

@@ -465,7 +465,7 @@ tas_dmasound_init(void)
val = pmac_call_feature(PMAC_FTR_READ_GPIO, NULL, gpio_headphone_detect, 0); 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); pmac_call_feature(PMAC_FTR_WRITE_GPIO, NULL, gpio_headphone_detect, val | 0x80);
/* Trigger it */ /* Trigger it */
headphone_intr(0,NULL,NULL); headphone_intr(0, NULL);
} }
} }
if (!gpio_headphone_irq) { 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); write_audio_gpio(gpio_audio_reset, !gpio_audio_reset_pol);
msleep(150); msleep(150);
tas_leave_sleep(); /* Stub for now */ tas_leave_sleep(); /* Stub for now */
headphone_intr(0,NULL,NULL); headphone_intr(0, NULL);
break; break;
case AWACS_DACA: case AWACS_DACA:
msleep(10); /* Check this !!! */ msleep(10); /* Check this !!! */