aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-11-29 04:32:18 -0500
committerLennert Buytenhek <buytenh@wantstofly.org>2011-01-13 11:18:36 -0500
commit465b40794c29497d93bc590f119e6e033b6d48d5 (patch)
tree49ecbc4a371d2a30a4d3cfd15f3264013c7525ef /arch
parent418c9904d3353f9d33f37d045975fed5d0ff1a81 (diff)
ARM: iop32x: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca> Acked-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-iop32x/irq.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c
index ba59b2d17db1..d3426a120599 100644
--- a/arch/arm/mach-iop32x/irq.c
+++ b/arch/arm/mach-iop32x/irq.c
@@ -32,24 +32,24 @@ static void intstr_write(u32 val)
32} 32}
33 33
34static void 34static void
35iop32x_irq_mask(unsigned int irq) 35iop32x_irq_mask(struct irq_data *d)
36{ 36{
37 iop32x_mask &= ~(1 << irq); 37 iop32x_mask &= ~(1 << d->irq);
38 intctl_write(iop32x_mask); 38 intctl_write(iop32x_mask);
39} 39}
40 40
41static void 41static void
42iop32x_irq_unmask(unsigned int irq) 42iop32x_irq_unmask(struct irq_data *d)
43{ 43{
44 iop32x_mask |= 1 << irq; 44 iop32x_mask |= 1 << d->irq;
45 intctl_write(iop32x_mask); 45 intctl_write(iop32x_mask);
46} 46}
47 47
48struct irq_chip ext_chip = { 48struct irq_chip ext_chip = {
49 .name = "IOP32x", 49 .name = "IOP32x",
50 .ack = iop32x_irq_mask, 50 .irq_ack = iop32x_irq_mask,
51 .mask = iop32x_irq_mask, 51 .irq_mask = iop32x_irq_mask,
52 .unmask = iop32x_irq_unmask, 52 .irq_unmask = iop32x_irq_unmask,
53}; 53};
54 54
55void __init iop32x_init_irq(void) 55void __init iop32x_init_irq(void)