diff options
Diffstat (limited to 'arch/ppc/platforms/radstone_ppc7d.c')
-rw-r--r-- | arch/ppc/platforms/radstone_ppc7d.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c index 3bb530af0297..13d70ab50bf1 100644 --- a/arch/ppc/platforms/radstone_ppc7d.c +++ b/arch/ppc/platforms/radstone_ppc7d.c | |||
@@ -451,11 +451,11 @@ static void __init ppc7d_calibrate_decr(void) | |||
451 | * Interrupt stuff | 451 | * Interrupt stuff |
452 | *****************************************************************************/ | 452 | *****************************************************************************/ |
453 | 453 | ||
454 | static irqreturn_t ppc7d_i8259_intr(int irq, void *dev_id, struct pt_regs *regs) | 454 | static irqreturn_t ppc7d_i8259_intr(int irq, void *dev_id) |
455 | { | 455 | { |
456 | u32 temp = mv64x60_read(&bh, MV64x60_GPP_INTR_CAUSE); | 456 | u32 temp = mv64x60_read(&bh, MV64x60_GPP_INTR_CAUSE); |
457 | if (temp & (1 << 28)) { | 457 | if (temp & (1 << 28)) { |
458 | i8259_irq(regs); | 458 | i8259_irq(); |
459 | mv64x60_write(&bh, MV64x60_GPP_INTR_CAUSE, temp & (~(1 << 28))); | 459 | mv64x60_write(&bh, MV64x60_GPP_INTR_CAUSE, temp & (~(1 << 28))); |
460 | return IRQ_HANDLED; | 460 | return IRQ_HANDLED; |
461 | } | 461 | } |
@@ -536,13 +536,13 @@ static u32 ppc7d_irq_canonicalize(u32 irq) | |||
536 | return irq; | 536 | return irq; |
537 | } | 537 | } |
538 | 538 | ||
539 | static int ppc7d_get_irq(struct pt_regs *regs) | 539 | static int ppc7d_get_irq(void) |
540 | { | 540 | { |
541 | int irq; | 541 | int irq; |
542 | 542 | ||
543 | irq = mv64360_get_irq(regs); | 543 | irq = mv64360_get_irq(); |
544 | if (irq == (mv64360_irq_base + MV64x60_IRQ_GPP28)) | 544 | if (irq == (mv64360_irq_base + MV64x60_IRQ_GPP28)) |
545 | irq = i8259_irq(regs); | 545 | irq = i8259_irq(); |
546 | return irq; | 546 | return irq; |
547 | } | 547 | } |
548 | 548 | ||