aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2010-02-27 06:53:31 -0500
committerRalf Baechle <ralf@linux-mips.org>2010-02-27 06:53:31 -0500
commit4a41abe5960b6a4d496aab94264beee06bc0ab7e (patch)
tree40203229eed66bdd87da6b2b91bc911e24da2ee0
parent4a8a738de637dc7141de5228d2d722573a329b95 (diff)
MIPS: Jazz: Convert irq controller lock to raw spinlock.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/jazz/irq.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/jazz/irq.c b/arch/mips/jazz/irq.c
index 7bd32d04c2cc..ee18028efe92 100644
--- a/arch/mips/jazz/irq.c
+++ b/arch/mips/jazz/irq.c
@@ -20,17 +20,17 @@
20#include <asm/jazz.h> 20#include <asm/jazz.h>
21#include <asm/pgtable.h> 21#include <asm/pgtable.h>
22 22
23static DEFINE_SPINLOCK(r4030_lock); 23static DEFINE_RAW_SPINLOCK(r4030_lock);
24 24
25static void enable_r4030_irq(unsigned int irq) 25static void enable_r4030_irq(unsigned int irq)
26{ 26{
27 unsigned int mask = 1 << (irq - JAZZ_IRQ_START); 27 unsigned int mask = 1 << (irq - JAZZ_IRQ_START);
28 unsigned long flags; 28 unsigned long flags;
29 29
30 spin_lock_irqsave(&r4030_lock, flags); 30 raw_spin_lock_irqsave(&r4030_lock, flags);
31 mask |= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE); 31 mask |= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE);
32 r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, mask); 32 r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, mask);
33 spin_unlock_irqrestore(&r4030_lock, flags); 33 raw_spin_unlock_irqrestore(&r4030_lock, flags);
34} 34}
35 35
36void disable_r4030_irq(unsigned int irq) 36void disable_r4030_irq(unsigned int irq)
@@ -38,10 +38,10 @@ void disable_r4030_irq(unsigned int irq)
38 unsigned int mask = ~(1 << (irq - JAZZ_IRQ_START)); 38 unsigned int mask = ~(1 << (irq - JAZZ_IRQ_START));
39 unsigned long flags; 39 unsigned long flags;
40 40
41 spin_lock_irqsave(&r4030_lock, flags); 41 raw_spin_lock_irqsave(&r4030_lock, flags);
42 mask &= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE); 42 mask &= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE);
43 r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, mask); 43 r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, mask);
44 spin_unlock_irqrestore(&r4030_lock, flags); 44 raw_spin_unlock_irqrestore(&r4030_lock, flags);
45} 45}
46 46
47static struct irq_chip r4030_irq_type = { 47static struct irq_chip r4030_irq_type = {