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>

4 files changed, 0 insertions, 26 deletions

diff --git a/arch/sh/boards/renesas/hs7751rvoip/irq.c b/arch/sh/boards/renesas/hs7751rvoip/irq.c
index 705b7ddcb0d2..c617b188258a 100644
--- a/arch/sh/boards/renesas/hs7751rvoip/irq.c
+++ b/arch/sh/boards/renesas/hs7751rvoip/irq.c
@@ -35,30 +35,24 @@ static unsigned int startup_hs7751rvoip_irq(unsigned int irq)
 
 static void disable_hs7751rvoip_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short val;
         unsigned short mask = 0xffff ^ (0x0001 << mask_pos[irq]);
 
         /* Set the priority in IPR to 0 */
-        local_irq_save(flags);
         val = ctrl_inw(IRLCNTR3);
         val &= mask;
         ctrl_outw(val, IRLCNTR3);
-        local_irq_restore(flags);
 }
 
 static void enable_hs7751rvoip_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short val;
         unsigned short value = (0x0001 << mask_pos[irq]);
 
         /* Set priority in IPR back to original value */
-        local_irq_save(flags);
         val = ctrl_inw(IRLCNTR3);
         val |= value;
         ctrl_outw(val, IRLCNTR3);
-        local_irq_restore(flags);
 }
 
 static void ack_hs7751rvoip_irq(unsigned int irq)
diff --git a/arch/sh/boards/renesas/r7780rp/irq.c b/arch/sh/boards/renesas/r7780rp/irq.c
index c7b9fe6e640d..61d5e5d3c294 100644
--- a/arch/sh/boards/renesas/r7780rp/irq.c
+++ b/arch/sh/boards/renesas/r7780rp/irq.c
@@ -39,30 +39,24 @@ static unsigned int startup_r7780rp_irq(unsigned int irq)
 
 static void disable_r7780rp_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short val;
         unsigned short mask = 0xffff ^ (0x0001 << mask_pos[irq]);
 
         /* Set the priority in IPR to 0 */
-        local_irq_save(flags);
         val = ctrl_inw(IRLCNTR1);
         val &= mask;
         ctrl_outw(val, IRLCNTR1);
-        local_irq_restore(flags);
 }
 
 static void enable_r7780rp_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short val;
         unsigned short value = (0x0001 << mask_pos[irq]);
 
         /* Set priority in IPR back to original value */
-        local_irq_save(flags);
         val = ctrl_inw(IRLCNTR1);
         val |= value;
         ctrl_outw(val, IRLCNTR1);
-        local_irq_restore(flags);
 }
 
 static void ack_r7780rp_irq(unsigned int irq)
diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c
index 154535440bbf..c915e7a3693a 100644
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -41,30 +41,24 @@ static unsigned int startup_rts7751r2d_irq(unsigned int irq)
 
 static void disable_rts7751r2d_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short val;
         unsigned short mask = 0xffff ^ (0x0001 << mask_pos[irq]);
 
         /* Set the priority in IPR to 0 */
-        local_irq_save(flags);
         val = ctrl_inw(IRLCNTR1);
         val &= mask;
         ctrl_outw(val, IRLCNTR1);
-        local_irq_restore(flags);
 }
 
 static void enable_rts7751r2d_irq(unsigned int irq)
 {
-        unsigned long flags;
         unsigned short val;
         unsigned short value = (0x0001 << mask_pos[irq]);
 
         /* Set priority in IPR back to original value */
-        local_irq_save(flags);
         val = ctrl_inw(IRLCNTR1);
         val |= value;
         ctrl_outw(val, IRLCNTR1);
-        local_irq_restore(flags);
 }
 
 int rts7751r2d_irq_demux(int irq)
diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c
index 53731a0abb8f..8d016dae2333 100644
--- a/arch/sh/boards/renesas/systemh/irq.c
+++ b/arch/sh/boards/renesas/systemh/irq.c
@@ -57,12 +57,9 @@ static void shutdown_systemh_irq(unsigned int irq)
 static void disable_systemh_irq(unsigned int irq)
 {
         if (systemh_irq_mask_register) {
-                unsigned long flags;
                 unsigned long val, mask = 0x01 << 1;
 
                 /* Clear the "irq"th bit in the mask and set it in the request */
-                local_irq_save(flags);
-
                 val = ctrl_inl((unsigned long)systemh_irq_mask_register);
                 val &= ~mask;
                 ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
@@ -70,23 +67,18 @@ static void disable_systemh_irq(unsigned int irq)
                 val = ctrl_inl((unsigned long)systemh_irq_request_register);
                 val |= mask;
                 ctrl_outl(val, (unsigned long)systemh_irq_request_register);
-
-                local_irq_restore(flags);
         }
 }
 
 static void enable_systemh_irq(unsigned int irq)
 {
         if (systemh_irq_mask_register) {
-                unsigned long flags;
                 unsigned long val, mask = 0x01 << 1;
 
                 /* Set "irq"th bit in the mask register */
-                local_irq_save(flags);
                 val = ctrl_inl((unsigned long)systemh_irq_mask_register);
                 val |= mask;
                 ctrl_outl(val, (unsigned long)systemh_irq_mask_register);
-                local_irq_restore(flags);
         }
 }