diff options
Diffstat (limited to 'arch/mips/sgi-ip32/ip32-irq.c')
-rw-r--r-- | arch/mips/sgi-ip32/ip32-irq.c | 75 |
1 files changed, 35 insertions, 40 deletions
diff --git a/arch/mips/sgi-ip32/ip32-irq.c b/arch/mips/sgi-ip32/ip32-irq.c index fc3a8e90d763..2eb22d692ed9 100644 --- a/arch/mips/sgi-ip32/ip32-irq.c +++ b/arch/mips/sgi-ip32/ip32-irq.c | |||
@@ -163,14 +163,13 @@ static void end_cpu_irq(unsigned int irq) | |||
163 | #define mask_and_ack_cpu_irq disable_cpu_irq | 163 | #define mask_and_ack_cpu_irq disable_cpu_irq |
164 | 164 | ||
165 | static struct hw_interrupt_type ip32_cpu_interrupt = { | 165 | static struct hw_interrupt_type ip32_cpu_interrupt = { |
166 | "IP32 CPU", | 166 | .typename = "IP32 CPU", |
167 | startup_cpu_irq, | 167 | .startup = startup_cpu_irq, |
168 | shutdown_cpu_irq, | 168 | .shutdown = shutdown_cpu_irq, |
169 | enable_cpu_irq, | 169 | .enable = enable_cpu_irq, |
170 | disable_cpu_irq, | 170 | .disable = disable_cpu_irq, |
171 | mask_and_ack_cpu_irq, | 171 | .ack = mask_and_ack_cpu_irq, |
172 | end_cpu_irq, | 172 | .end = end_cpu_irq, |
173 | NULL | ||
174 | }; | 173 | }; |
175 | 174 | ||
176 | /* | 175 | /* |
@@ -234,14 +233,13 @@ static void end_crime_irq(unsigned int irq) | |||
234 | #define shutdown_crime_irq disable_crime_irq | 233 | #define shutdown_crime_irq disable_crime_irq |
235 | 234 | ||
236 | static struct hw_interrupt_type ip32_crime_interrupt = { | 235 | static struct hw_interrupt_type ip32_crime_interrupt = { |
237 | "IP32 CRIME", | 236 | .typename = "IP32 CRIME", |
238 | startup_crime_irq, | 237 | .startup = startup_crime_irq, |
239 | shutdown_crime_irq, | 238 | .shutdown = shutdown_crime_irq, |
240 | enable_crime_irq, | 239 | .enable = enable_crime_irq, |
241 | disable_crime_irq, | 240 | .disable = disable_crime_irq, |
242 | mask_and_ack_crime_irq, | 241 | .ack = mask_and_ack_crime_irq, |
243 | end_crime_irq, | 242 | .end = end_crime_irq, |
244 | NULL | ||
245 | }; | 243 | }; |
246 | 244 | ||
247 | /* | 245 | /* |
@@ -294,14 +292,13 @@ static void end_macepci_irq(unsigned int irq) | |||
294 | #define mask_and_ack_macepci_irq disable_macepci_irq | 292 | #define mask_and_ack_macepci_irq disable_macepci_irq |
295 | 293 | ||
296 | static struct hw_interrupt_type ip32_macepci_interrupt = { | 294 | static struct hw_interrupt_type ip32_macepci_interrupt = { |
297 | "IP32 MACE PCI", | 295 | .typename = "IP32 MACE PCI", |
298 | startup_macepci_irq, | 296 | .startup = startup_macepci_irq, |
299 | shutdown_macepci_irq, | 297 | .shutdown = shutdown_macepci_irq, |
300 | enable_macepci_irq, | 298 | .enable = enable_macepci_irq, |
301 | disable_macepci_irq, | 299 | .disable = disable_macepci_irq, |
302 | mask_and_ack_macepci_irq, | 300 | .ack = mask_and_ack_macepci_irq, |
303 | end_macepci_irq, | 301 | .end = end_macepci_irq, |
304 | NULL | ||
305 | }; | 302 | }; |
306 | 303 | ||
307 | /* This is used for MACE ISA interrupts. That means bits 4-6 in the | 304 | /* This is used for MACE ISA interrupts. That means bits 4-6 in the |
@@ -425,14 +422,13 @@ static void end_maceisa_irq(unsigned irq) | |||
425 | #define shutdown_maceisa_irq disable_maceisa_irq | 422 | #define shutdown_maceisa_irq disable_maceisa_irq |
426 | 423 | ||
427 | static struct hw_interrupt_type ip32_maceisa_interrupt = { | 424 | static struct hw_interrupt_type ip32_maceisa_interrupt = { |
428 | "IP32 MACE ISA", | 425 | .typename = "IP32 MACE ISA", |
429 | startup_maceisa_irq, | 426 | .startup = startup_maceisa_irq, |
430 | shutdown_maceisa_irq, | 427 | .shutdown = shutdown_maceisa_irq, |
431 | enable_maceisa_irq, | 428 | .enable = enable_maceisa_irq, |
432 | disable_maceisa_irq, | 429 | .disable = disable_maceisa_irq, |
433 | mask_and_ack_maceisa_irq, | 430 | .ack = mask_and_ack_maceisa_irq, |
434 | end_maceisa_irq, | 431 | .end = end_maceisa_irq, |
435 | NULL | ||
436 | }; | 432 | }; |
437 | 433 | ||
438 | /* This is used for regular non-ISA, non-PCI MACE interrupts. That means | 434 | /* This is used for regular non-ISA, non-PCI MACE interrupts. That means |
@@ -476,14 +472,13 @@ static void end_mace_irq(unsigned int irq) | |||
476 | #define mask_and_ack_mace_irq disable_mace_irq | 472 | #define mask_and_ack_mace_irq disable_mace_irq |
477 | 473 | ||
478 | static struct hw_interrupt_type ip32_mace_interrupt = { | 474 | static struct hw_interrupt_type ip32_mace_interrupt = { |
479 | "IP32 MACE", | 475 | .typename = "IP32 MACE", |
480 | startup_mace_irq, | 476 | .startup = startup_mace_irq, |
481 | shutdown_mace_irq, | 477 | .shutdown = shutdown_mace_irq, |
482 | enable_mace_irq, | 478 | .enable = enable_mace_irq, |
483 | disable_mace_irq, | 479 | .disable = disable_mace_irq, |
484 | mask_and_ack_mace_irq, | 480 | .ack = mask_and_ack_mace_irq, |
485 | end_mace_irq, | 481 | .end = end_mace_irq, |
486 | NULL | ||
487 | }; | 482 | }; |
488 | 483 | ||
489 | static void ip32_unknown_interrupt(struct pt_regs *regs) | 484 | static void ip32_unknown_interrupt(struct pt_regs *regs) |