diff options
Diffstat (limited to 'arch/m68k/mac/via.c')
-rw-r--r-- | arch/m68k/mac/via.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c index 83a3bb0c0325..d5cac72eb3db 100644 --- a/arch/m68k/mac/via.c +++ b/arch/m68k/mac/via.c | |||
@@ -443,11 +443,6 @@ void __init via_nubus_init(void) | |||
443 | /* | 443 | /* |
444 | * The generic VIA interrupt routines (shamelessly stolen from Alan Cox's | 444 | * The generic VIA interrupt routines (shamelessly stolen from Alan Cox's |
445 | * via6522.c :-), disable/pending masks added. | 445 | * via6522.c :-), disable/pending masks added. |
446 | * | ||
447 | * The new interrupt architecture in macints.c takes care of a lot of the | ||
448 | * gruntwork for us, including tallying the interrupts and calling the | ||
449 | * handlers on the linked list. All we need to do here is basically generate | ||
450 | * the machspec interrupt number after clearing the interrupt. | ||
451 | */ | 446 | */ |
452 | 447 | ||
453 | irqreturn_t via1_irq(int irq, void *dev_id) | 448 | irqreturn_t via1_irq(int irq, void *dev_id) |
@@ -463,10 +458,8 @@ irqreturn_t via1_irq(int irq, void *dev_id) | |||
463 | irq_bit = 1; | 458 | irq_bit = 1; |
464 | do { | 459 | do { |
465 | if (events & irq_bit) { | 460 | if (events & irq_bit) { |
466 | via1[vIER] = irq_bit; | ||
467 | via1[vIFR] = irq_bit; | 461 | via1[vIFR] = irq_bit; |
468 | m68k_handle_int(irq_num); | 462 | m68k_handle_int(irq_num); |
469 | via1[vIER] = irq_bit | 0x80; | ||
470 | } | 463 | } |
471 | ++irq_num; | 464 | ++irq_num; |
472 | irq_bit <<= 1; | 465 | irq_bit <<= 1; |
@@ -502,11 +495,8 @@ irqreturn_t via2_irq(int irq, void *dev_id) | |||
502 | irq_bit = 1; | 495 | irq_bit = 1; |
503 | do { | 496 | do { |
504 | if (events & irq_bit) { | 497 | if (events & irq_bit) { |
505 | via2[gIER] = irq_bit; | ||
506 | via2[gIFR] = irq_bit | rbv_clear; | 498 | via2[gIFR] = irq_bit | rbv_clear; |
507 | m68k_handle_int(irq_num); | 499 | m68k_handle_int(irq_num); |
508 | if (irq_num != IRQ_MAC_NUBUS || nubus_disabled == 0) | ||
509 | via2[gIER] = irq_bit | 0x80; | ||
510 | } | 500 | } |
511 | ++irq_num; | 501 | ++irq_num; |
512 | irq_bit <<= 1; | 502 | irq_bit <<= 1; |