Skip to content

Commit

Permalink
ARM: iop33x: irq_data conversion.
Browse files Browse the repository at this point in the history
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Lennert Buytenhek committed Jan 13, 2011
1 parent 465b407 commit a0ad2a7
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions arch/arm/mach-iop33x/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,45 +53,45 @@ static void intsize_write(u32 val)
}

static void
iop33x_irq_mask1 (unsigned int irq)
iop33x_irq_mask1 (struct irq_data *d)
{
iop33x_mask0 &= ~(1 << irq);
iop33x_mask0 &= ~(1 << d->irq);
intctl0_write(iop33x_mask0);
}

static void
iop33x_irq_mask2 (unsigned int irq)
iop33x_irq_mask2 (struct irq_data *d)
{
iop33x_mask1 &= ~(1 << (irq - 32));
iop33x_mask1 &= ~(1 << (d->irq - 32));
intctl1_write(iop33x_mask1);
}

static void
iop33x_irq_unmask1(unsigned int irq)
iop33x_irq_unmask1(struct irq_data *d)
{
iop33x_mask0 |= 1 << irq;
iop33x_mask0 |= 1 << d->irq;
intctl0_write(iop33x_mask0);
}

static void
iop33x_irq_unmask2(unsigned int irq)
iop33x_irq_unmask2(struct irq_data *d)
{
iop33x_mask1 |= (1 << (irq - 32));
iop33x_mask1 |= (1 << (d->irq - 32));
intctl1_write(iop33x_mask1);
}

struct irq_chip iop33x_irqchip1 = {
.name = "IOP33x-1",
.ack = iop33x_irq_mask1,
.mask = iop33x_irq_mask1,
.unmask = iop33x_irq_unmask1,
.name = "IOP33x-1",
.irq_ack = iop33x_irq_mask1,
.irq_mask = iop33x_irq_mask1,
.irq_unmask = iop33x_irq_unmask1,
};

struct irq_chip iop33x_irqchip2 = {
.name = "IOP33x-2",
.ack = iop33x_irq_mask2,
.mask = iop33x_irq_mask2,
.unmask = iop33x_irq_unmask2,
.name = "IOP33x-2",
.irq_ack = iop33x_irq_mask2,
.irq_mask = iop33x_irq_mask2,
.irq_unmask = iop33x_irq_unmask2,
};

void __init iop33x_init_irq(void)
Expand Down

0 comments on commit a0ad2a7

Please sign in to comment.