Skip to content

Commit

Permalink
MIPS: Jazz: Convert irq controller lock to raw spinlock.
Browse files Browse the repository at this point in the history
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Feb 27, 2010
1 parent 4a8a738 commit 4a41abe
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/mips/jazz/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@
#include <asm/jazz.h>
#include <asm/pgtable.h>

static DEFINE_SPINLOCK(r4030_lock);
static DEFINE_RAW_SPINLOCK(r4030_lock);

static void enable_r4030_irq(unsigned int irq)
{
unsigned int mask = 1 << (irq - JAZZ_IRQ_START);
unsigned long flags;

spin_lock_irqsave(&r4030_lock, flags);
raw_spin_lock_irqsave(&r4030_lock, flags);
mask |= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE);
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)
{
unsigned int mask = ~(1 << (irq - JAZZ_IRQ_START));
unsigned long flags;

spin_lock_irqsave(&r4030_lock, flags);
raw_spin_lock_irqsave(&r4030_lock, flags);
mask &= r4030_read_reg16(JAZZ_IO_IRQ_ENABLE);
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 = {
Expand Down

0 comments on commit 4a41abe

Please sign in to comment.