diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-10-07 14:44:33 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-10-07 21:38:28 -0400 |
commit | 937a801576f954bd030d7c4a5a94571710d87c0b (patch) | |
tree | 48d3440f765b56cf32a89b4b8193dd033d8227a8 /arch/mips/momentum/ocelot_c | |
parent | 31aa36658a123263a9a69896e348b9600e050679 (diff) |
[MIPS] Complete fixes after removal of pt_regs argument to int handlers.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/momentum/ocelot_c')
-rw-r--r-- | arch/mips/momentum/ocelot_c/cpci-irq.c | 4 | ||||
-rw-r--r-- | arch/mips/momentum/ocelot_c/irq.c | 22 | ||||
-rw-r--r-- | arch/mips/momentum/ocelot_c/uart-irq.c | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/arch/mips/momentum/ocelot_c/cpci-irq.c b/arch/mips/momentum/ocelot_c/cpci-irq.c index a5dc230520df..2fb14bb08e67 100644 --- a/arch/mips/momentum/ocelot_c/cpci-irq.c +++ b/arch/mips/momentum/ocelot_c/cpci-irq.c | |||
@@ -112,7 +112,7 @@ static void end_cpci_irq(unsigned int irq) | |||
112 | * Interrupt handler for interrupts coming from the FPGA chip. | 112 | * Interrupt handler for interrupts coming from the FPGA chip. |
113 | * It could be built in ethernet ports etc... | 113 | * It could be built in ethernet ports etc... |
114 | */ | 114 | */ |
115 | void ll_cpci_irq(struct pt_regs *regs) | 115 | void ll_cpci_irq(void) |
116 | { | 116 | { |
117 | unsigned int irq_src, irq_mask; | 117 | unsigned int irq_src, irq_mask; |
118 | 118 | ||
@@ -123,7 +123,7 @@ void ll_cpci_irq(struct pt_regs *regs) | |||
123 | /* mask for just the interrupts we want */ | 123 | /* mask for just the interrupts we want */ |
124 | irq_src &= ~irq_mask; | 124 | irq_src &= ~irq_mask; |
125 | 125 | ||
126 | do_IRQ(ls1bit8(irq_src) + CPCI_IRQ_BASE, regs); | 126 | do_IRQ(ls1bit8(irq_src) + CPCI_IRQ_BASE); |
127 | } | 127 | } |
128 | 128 | ||
129 | #define shutdown_cpci_irq disable_cpci_irq | 129 | #define shutdown_cpci_irq disable_cpci_irq |
diff --git a/arch/mips/momentum/ocelot_c/irq.c b/arch/mips/momentum/ocelot_c/irq.c index 9d44ae1e156b..4be7b26e30ef 100644 --- a/arch/mips/momentum/ocelot_c/irq.c +++ b/arch/mips/momentum/ocelot_c/irq.c | |||
@@ -59,31 +59,31 @@ static struct irqaction cascade_mv64340 = { | |||
59 | no_action, IRQF_DISABLED, CPU_MASK_NONE, "cascade via MV64340", NULL, NULL | 59 | no_action, IRQF_DISABLED, CPU_MASK_NONE, "cascade via MV64340", NULL, NULL |
60 | }; | 60 | }; |
61 | 61 | ||
62 | extern void ll_uart_irq(struct pt_regs *regs); | 62 | extern void ll_uart_irq(void); |
63 | extern void ll_cpci_irq(struct pt_regs *regs); | 63 | extern void ll_cpci_irq(void); |
64 | 64 | ||
65 | asmlinkage void plat_irq_dispatch(struct pt_regs *regs) | 65 | asmlinkage void plat_irq_dispatch(void) |
66 | { | 66 | { |
67 | unsigned int pending = read_c0_cause() & read_c0_status(); | 67 | unsigned int pending = read_c0_cause() & read_c0_status(); |
68 | 68 | ||
69 | if (pending & STATUSF_IP0) | 69 | if (pending & STATUSF_IP0) |
70 | do_IRQ(0, regs); | 70 | do_IRQ(0); |
71 | else if (pending & STATUSF_IP1) | 71 | else if (pending & STATUSF_IP1) |
72 | do_IRQ(1, regs); | 72 | do_IRQ(1); |
73 | else if (pending & STATUSF_IP2) | 73 | else if (pending & STATUSF_IP2) |
74 | do_IRQ(2, regs); | 74 | do_IRQ(2); |
75 | else if (pending & STATUSF_IP3) | 75 | else if (pending & STATUSF_IP3) |
76 | ll_uart_irq(regs); | 76 | ll_uart_irq(); |
77 | else if (pending & STATUSF_IP4) | 77 | else if (pending & STATUSF_IP4) |
78 | do_IRQ(4, regs); | 78 | do_IRQ(4); |
79 | else if (pending & STATUSF_IP5) | 79 | else if (pending & STATUSF_IP5) |
80 | ll_cpci_irq(regs); | 80 | ll_cpci_irq(); |
81 | else if (pending & STATUSF_IP6) | 81 | else if (pending & STATUSF_IP6) |
82 | ll_mv64340_irq(regs); | 82 | ll_mv64340_irq(regs); |
83 | else if (pending & STATUSF_IP7) | 83 | else if (pending & STATUSF_IP7) |
84 | do_IRQ(7, regs); | 84 | do_IRQ(7); |
85 | else | 85 | else |
86 | spurious_interrupt(regs); | 86 | spurious_interrupt(); |
87 | } | 87 | } |
88 | 88 | ||
89 | void __init arch_init_irq(void) | 89 | void __init arch_init_irq(void) |
diff --git a/arch/mips/momentum/ocelot_c/uart-irq.c b/arch/mips/momentum/ocelot_c/uart-irq.c index 9f33d8f1d826..f8efe2370ffd 100644 --- a/arch/mips/momentum/ocelot_c/uart-irq.c +++ b/arch/mips/momentum/ocelot_c/uart-irq.c | |||
@@ -105,7 +105,7 @@ static void end_uart_irq(unsigned int irq) | |||
105 | /* | 105 | /* |
106 | * Interrupt handler for interrupts coming from the FPGA chip. | 106 | * Interrupt handler for interrupts coming from the FPGA chip. |
107 | */ | 107 | */ |
108 | void ll_uart_irq(struct pt_regs *regs) | 108 | void ll_uart_irq(void) |
109 | { | 109 | { |
110 | unsigned int irq_src, irq_mask; | 110 | unsigned int irq_src, irq_mask; |
111 | 111 | ||
@@ -116,7 +116,7 @@ void ll_uart_irq(struct pt_regs *regs) | |||
116 | /* mask for just the interrupts we want */ | 116 | /* mask for just the interrupts we want */ |
117 | irq_src &= ~irq_mask; | 117 | irq_src &= ~irq_mask; |
118 | 118 | ||
119 | do_IRQ(ls1bit8(irq_src) + 74, regs); | 119 | do_IRQ(ls1bit8(irq_src) + 74); |
120 | } | 120 | } |
121 | 121 | ||
122 | #define shutdown_uart_irq disable_uart_irq | 122 | #define shutdown_uart_irq disable_uart_irq |