Skip to content

Commit

Permalink
MIPS: JAZZ: Convert to new irq_chip functions
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2180/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Thomas Gleixner authored and Ralf Baechle committed Mar 25, 2011
1 parent 90a568f commit db00bed
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions arch/mips/jazz/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@

static DEFINE_RAW_SPINLOCK(r4030_lock);

static void enable_r4030_irq(unsigned int irq)
static void enable_r4030_irq(struct irq_data *d)
{
unsigned int mask = 1 << (irq - JAZZ_IRQ_START);
unsigned int mask = 1 << (d->irq - JAZZ_IRQ_START);
unsigned long flags;

raw_spin_lock_irqsave(&r4030_lock, flags);
Expand All @@ -34,9 +34,9 @@ static void enable_r4030_irq(unsigned int irq)
raw_spin_unlock_irqrestore(&r4030_lock, flags);
}

void disable_r4030_irq(unsigned int irq)
void disable_r4030_irq(struct irq_data *d)
{
unsigned int mask = ~(1 << (irq - JAZZ_IRQ_START));
unsigned int mask = ~(1 << (d->irq - JAZZ_IRQ_START));
unsigned long flags;

raw_spin_lock_irqsave(&r4030_lock, flags);
Expand All @@ -47,10 +47,8 @@ void disable_r4030_irq(unsigned int irq)

static struct irq_chip r4030_irq_type = {
.name = "R4030",
.ack = disable_r4030_irq,
.mask = disable_r4030_irq,
.mask_ack = disable_r4030_irq,
.unmask = enable_r4030_irq,
.irq_mask = disable_r4030_irq,
.irq_unmask = enable_r4030_irq,
};

void __init init_r4030_ints(void)
Expand Down

0 comments on commit db00bed

Please sign in to comment.