m68k: Mac IRQ cleanup

There are no slow IRQs on Macs since Roman Zippel's IRQ reorganisation that
went into 2.6.16 and removed mac_irq_list[] and the do_mac_irq_list()
dispatcher. (They were implemented in do_mac_irq_list() by lowering the IPL.)
Hence there's no more use for mutual exclusion in the Mac interrupt
dispatchers. Remove it.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 0 insertions, 4 deletions

diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 6399883ae742..d7be16917efd 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -112,10 +112,8 @@ irqreturn_t oss_irq(int irq, void *dev_id)
                 oss->irq_pending &= ~OSS_IP_SOUND;
                 /* FIXME: call sound handler */
         } else if (events & OSS_IP_SCSI) {
-                oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED;
                 oss->irq_pending &= ~OSS_IP_SCSI;
                 m68k_handle_int(IRQ_MAC_SCSI);
-                oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI;
         } else {
                 /* FIXME: error check here? */
         }
@@ -149,10 +147,8 @@ irqreturn_t oss_nubus_irq(int irq, void *dev_id)
                 --i;
                 irq_bit >>= 1;
                 if (events & irq_bit) {
-                        oss->irq_level[i] = OSS_IRQLEV_DISABLED;
                         oss->irq_pending &= ~irq_bit;
                         m68k_handle_int(NUBUS_SOURCE_BASE + i);
-                        oss->irq_level[i] = OSS_IRQLEV_NUBUS;
                 }
         } while(events & (irq_bit - 1));
         return IRQ_HANDLED;