aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2010-02-27 06:53:34 -0500
committerRalf Baechle <ralf@linux-mips.org>2010-02-27 06:53:34 -0500
commitc45ef44f474a82fdec96704bece192e487dca373 (patch)
tree0785d105b4b7ed8b8cf6dcf0c46f3ba0b2f41585
parenta963dc70a286898c91d021e53317ba3d485e0b93 (diff)
MIPS: PowerTV: Convert IRQ controller lock to raw spinlock.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Cc: David VomLehn <dvomlehn@cisco.com>
-rw-r--r--arch/mips/powertv/asic/asic_int.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/powertv/asic/asic_int.c b/arch/mips/powertv/asic/asic_int.c
index 80b2eed21ac3..325fab9685d1 100644
--- a/arch/mips/powertv/asic/asic_int.c
+++ b/arch/mips/powertv/asic/asic_int.c
@@ -39,21 +39,21 @@
39 39
40#include <asm/mach-powertv/asic_regs.h> 40#include <asm/mach-powertv/asic_regs.h>
41 41
42static DEFINE_SPINLOCK(asic_irq_lock); 42static DEFINE_RAW_SPINLOCK(asic_irq_lock);
43 43
44static inline int get_int(void) 44static inline int get_int(void)
45{ 45{
46 unsigned long flags; 46 unsigned long flags;
47 int irq; 47 int irq;
48 48
49 spin_lock_irqsave(&asic_irq_lock, flags); 49 raw_spin_lock_irqsave(&asic_irq_lock, flags);
50 50
51 irq = (asic_read(int_int_scan) >> 4) - 1; 51 irq = (asic_read(int_int_scan) >> 4) - 1;
52 52
53 if (irq == 0 || irq >= NR_IRQS) 53 if (irq == 0 || irq >= NR_IRQS)
54 irq = -1; 54 irq = -1;
55 55
56 spin_unlock_irqrestore(&asic_irq_lock, flags); 56 raw_spin_unlock_irqrestore(&asic_irq_lock, flags);
57 57
58 return irq; 58 return irq;
59} 59}