lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: iop33x: irq_data conversion.

Browse Source 
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Lennert Buytenhek
2010-11-29 10:32:37 +01:00
parent 465b40794c
commit a0ad2a7e6b
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
arch/arm/mach-iop33x/irq.c
View File

@@ -53,45 +53,45 @@ static void intsize_write(u32 val)
} }
static void 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); intctl0_write(iop33x_mask0);
} }
static void 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); intctl1_write(iop33x_mask1);
} }
static void 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); intctl0_write(iop33x_mask0);
} }
static void 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); intctl1_write(iop33x_mask1);
} }
struct irq_chip iop33x_irqchip1 = { struct irq_chip iop33x_irqchip1 = {
.name = "IOP33x-1", .name = "IOP33x-1",
.ack = iop33x_irq_mask1, .irq_ack = iop33x_irq_mask1,
.mask = iop33x_irq_mask1, .irq_mask = iop33x_irq_mask1,
.unmask = iop33x_irq_unmask1, .irq_unmask = iop33x_irq_unmask1,
}; };
struct irq_chip iop33x_irqchip2 = { struct irq_chip iop33x_irqchip2 = {
.name = "IOP33x-2", .name = "IOP33x-2",
.ack = iop33x_irq_mask2, .irq_ack = iop33x_irq_mask2,
.mask = iop33x_irq_mask2, .irq_mask = iop33x_irq_mask2,
.unmask = iop33x_irq_unmask2, .irq_unmask = iop33x_irq_unmask2,
}; };
void __init iop33x_init_irq(void) void __init iop33x_init_irq(void)