Skip to content

Commit

Permalink
ARM: nuc93x: irq_data conversion.
Browse files Browse the repository at this point in the history
Signed-off-by: Lennert Buytenhek <[email protected]>
Acked-by: Wan ZongShun <[email protected]>
  • Loading branch information
buytenh committed Jan 13, 2011
1 parent 9b3ffe5 commit 85dcd90
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions arch/arm/mach-nuc93x/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,31 @@
#include <mach/hardware.h>
#include <mach/regs-irq.h>

static void nuc93x_irq_mask(unsigned int irq)
static void nuc93x_irq_mask(struct irq_data *d)
{
__raw_writel(1 << irq, REG_AIC_MDCR);
__raw_writel(1 << d->irq, REG_AIC_MDCR);
}

/*
* By the w90p910 spec,any irq,only write 1
* to REG_AIC_EOSCR for ACK
*/

static void nuc93x_irq_ack(unsigned int irq)
static void nuc93x_irq_ack(struct irq_data *d)
{
__raw_writel(0x01, REG_AIC_EOSCR);
}

static void nuc93x_irq_unmask(unsigned int irq)
static void nuc93x_irq_unmask(struct irq_data *d)
{
__raw_writel(1 << irq, REG_AIC_MECR);
__raw_writel(1 << d->irq, REG_AIC_MECR);

}

static struct irq_chip nuc93x_irq_chip = {
.ack = nuc93x_irq_ack,
.mask = nuc93x_irq_mask,
.unmask = nuc93x_irq_unmask,
.irq_ack = nuc93x_irq_ack,
.irq_mask = nuc93x_irq_mask,
.irq_unmask = nuc93x_irq_unmask,
};

void __init nuc93x_init_irq(void)
Expand Down

0 comments on commit 85dcd90

Please sign in to comment.