sh: Cleanup IRQ disabling for hardirq handlers.

The generic hardirq layer already takes care of a lot of the
appropriate locking and disabling for us, no need to duplicate
it in the handlers..

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

3 files changed, 6 insertions, 27 deletions

diff --git a/arch/sh/cchips/hd6446x/hd64461/setup.c b/arch/sh/cchips/hd6446x/hd64461/setup.c
index 6c961273a23a..38f1e8171a3a 100644
--- a/arch/sh/cchips/hd6446x/hd64461/setup.c
+++ b/arch/sh/cchips/hd6446x/hd64461/setup.c
@@ -11,35 +11,28 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/irq.h>
-
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/hd64461.h>
 
 static void disable_hd64461_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short nimr;
         unsigned short mask = 1 << (irq - HD64461_IRQBASE);
 
-        local_irq_save(flags);
         nimr = inw(HD64461_NIMR);
         nimr |= mask;
         outw(nimr, HD64461_NIMR);
-        local_irq_restore(flags);
 }
 
 static void enable_hd64461_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short nimr;
         unsigned short mask = 1 << (irq - HD64461_IRQBASE);
 
-        local_irq_save(flags);
         nimr = inw(HD64461_NIMR);
         nimr &= ~mask;
         outw(nimr, HD64461_NIMR);
-        local_irq_restore(flags);
 }
 
 static void mask_and_ack_hd64461(unsigned int irq)
diff --git a/arch/sh/cchips/hd6446x/hd64465/setup.c b/arch/sh/cchips/hd6446x/hd64465/setup.c
index d2b2851bc44b..30573d3e1966 100644
--- a/arch/sh/cchips/hd6446x/hd64465/setup.c
+++ b/arch/sh/cchips/hd6446x/hd64465/setup.c
@@ -25,31 +25,25 @@
 
 static void disable_hd64465_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short nimr;
         unsigned short mask = 1 << (irq - HD64465_IRQ_BASE);
 
         pr_debug("disable_hd64465_irq(%d): mask=%x\n", irq, mask);
-        local_irq_save(flags);
         nimr = inw(HD64465_REG_NIMR);
         nimr |= mask;
         outw(nimr, HD64465_REG_NIMR);
-        local_irq_restore(flags);
 }
 
 
 static void enable_hd64465_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short nimr;
         unsigned short mask = 1 << (irq - HD64465_IRQ_BASE);
 
         pr_debug("enable_hd64465_irq(%d): mask=%x\n", irq, mask);
-        local_irq_save(flags);
         nimr = inw(HD64465_REG_NIMR);
         nimr &= ~mask;
         outw(nimr, HD64465_REG_NIMR);
-        local_irq_restore(flags);
 }
 
 
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c
index 4cfa7c990553..392c8b12ce36 100644
--- a/arch/sh/cchips/voyagergx/irq.c
+++ b/arch/sh/cchips/voyagergx/irq.c
@@ -36,32 +36,26 @@
 
 static void disable_voyagergx_irq(unsigned int irq)
 {
-        unsigned long flags, val;
-        unsigned long  mask = 1 << (irq - VOYAGER_IRQ_BASE);
+        unsigned long val;
+        unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE);
 
         pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask);
-        local_irq_save(flags);
         val = inl(VOYAGER_INT_MASK);
         val &= ~mask;
         outl(val, VOYAGER_INT_MASK);
-        local_irq_restore(flags);
 }
 
-
 static void enable_voyagergx_irq(unsigned int irq)
 {
-        unsigned long flags, val;
-        unsigned long  mask = 1 << (irq - VOYAGER_IRQ_BASE);
+        unsigned long val;
+        unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE);
 
         pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask);
-        local_irq_save(flags);
         val = inl(VOYAGER_INT_MASK);
         val |= mask;
         outl(val, VOYAGER_INT_MASK);
-        local_irq_restore(flags);
 }
 
-
 static void mask_and_ack_voyagergx(unsigned int irq)
 {
         disable_voyagergx_irq(irq);
@@ -94,7 +88,8 @@ static struct hw_interrupt_type voyagergx_irq_type = {
         .end = end_voyagergx_irq,
 };
 
-static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t voyagergx_interrupt(int irq, void *dev_id,
+                                      struct pt_regs *regs)
 {
         printk(KERN_INFO
                "VoyagerGX: spurious interrupt, status: 0x%x\n",
@@ -102,9 +97,6 @@ static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *re
         return IRQ_HANDLED;
 }
 
-
-/*====================================================*/
-
 static struct {
         int (*func)(int, void *);
         void *dev;