Skip to content

L
linux-davinci
Commit 4a41abe5 authored by Ralf Baechle's avatar Ralf Baechle
Browse files
Options

MIPS: Jazz: Convert irq controller lock to raw spinlock. 

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 4a8a738d
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
arch/mips/jazz/irq.c
View file @ 4a41abe5
...@@ -20,17 +20,17 @@ ...@@ -20,17 +20,17 @@
#include <asm/jazz.h> #include <asm/jazz.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
static DEFINE_SPINLOCK(r4030_lock); static DEFINE_RAW_SPINLOCK(r4030_lock);
static void enable_r4030_irq(unsigned int irq) static void enable_r4030_irq(unsigned int irq)
{ {
unsigned int mask = 1 << (irq - JAZZ_IRQ_START); unsigned int mask = 1 << (irq - JAZZ_IRQ_START);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&r4030_lock, flags); raw_spin_lock_irqsave(&r4030_lock, flags);
mask |= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE); mask |= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE);
r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, mask); r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, mask);
spin_unlock_irqrestore(&r4030_lock, flags); raw_spin_unlock_irqrestore(&r4030_lock, flags);
} }
void disable_r4030_irq(unsigned int irq) void disable_r4030_irq(unsigned int irq)
...@@ -38,10 +38,10 @@ void disable_r4030_irq(unsigned int irq) ...@@ -38,10 +38,10 @@ void disable_r4030_irq(unsigned int irq)
unsigned int mask = ~(1 << (irq - JAZZ_IRQ_START)); unsigned int mask = ~(1 << (irq - JAZZ_IRQ_START));
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&r4030_lock, flags); raw_spin_lock_irqsave(&r4030_lock, flags);
mask &= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE); mask &= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE);
r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, mask); r4030_write_reg16(JAZZ_IO_IRQ_ENABLE, mask);
spin_unlock_irqrestore(&r4030_lock, flags); raw_spin_unlock_irqrestore(&r4030_lock, flags);
} }
static struct irq_chip r4030_irq_type = { static struct irq_chip r4030_irq_type = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment