aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp2000/ixdp2x00.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2010-11-29 04:32:55 -0500
committerLennert Buytenhek <buytenh@wantstofly.org>2011-01-13 11:18:38 -0500
commit6e8f54fad5b2e15b64595d6ededb316d713db102 (patch)
treeef66ac16c288867cba25c60d6252e3495b9c8454 /arch/arm/mach-ixp2000/ixdp2x00.c
parenta0ad2a7e6b74def9b3b0db0cd4daea7a1bccef59 (diff)
ARM: ixp2000: irq_data conversion.
Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2x00.c')
-rw-r--r--arch/arm/mach-ixp2000/ixdp2x00.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index 91fffb9b2084..7d90d3f13ee8 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -63,7 +63,7 @@ static struct slowport_cfg slowport_cpld_cfg = {
63}; 63};
64#endif 64#endif
65 65
66static void ixdp2x00_irq_mask(unsigned int irq) 66static void ixdp2x00_irq_mask(struct irq_data *d)
67{ 67{
68 unsigned long dummy; 68 unsigned long dummy;
69 static struct slowport_cfg old_cfg; 69 static struct slowport_cfg old_cfg;
@@ -78,7 +78,7 @@ static void ixdp2x00_irq_mask(unsigned int irq)
78#endif 78#endif
79 79
80 dummy = *board_irq_mask; 80 dummy = *board_irq_mask;
81 dummy |= IXP2000_BOARD_IRQ_MASK(irq); 81 dummy |= IXP2000_BOARD_IRQ_MASK(d->irq);
82 ixp2000_reg_wrb(board_irq_mask, dummy); 82 ixp2000_reg_wrb(board_irq_mask, dummy);
83 83
84#ifdef CONFIG_ARCH_IXDP2400 84#ifdef CONFIG_ARCH_IXDP2400
@@ -87,7 +87,7 @@ static void ixdp2x00_irq_mask(unsigned int irq)
87#endif 87#endif
88} 88}
89 89
90static void ixdp2x00_irq_unmask(unsigned int irq) 90static void ixdp2x00_irq_unmask(struct irq_data *d)
91{ 91{
92 unsigned long dummy; 92 unsigned long dummy;
93 static struct slowport_cfg old_cfg; 93 static struct slowport_cfg old_cfg;
@@ -98,7 +98,7 @@ static void ixdp2x00_irq_unmask(unsigned int irq)
98#endif 98#endif
99 99
100 dummy = *board_irq_mask; 100 dummy = *board_irq_mask;
101 dummy &= ~IXP2000_BOARD_IRQ_MASK(irq); 101 dummy &= ~IXP2000_BOARD_IRQ_MASK(d->irq);
102 ixp2000_reg_wrb(board_irq_mask, dummy); 102 ixp2000_reg_wrb(board_irq_mask, dummy);
103 103
104 if (machine_is_ixdp2400()) 104 if (machine_is_ixdp2400())
@@ -111,7 +111,7 @@ static void ixdp2x00_irq_handler(unsigned int irq, struct irq_desc *desc)
111 static struct slowport_cfg old_cfg; 111 static struct slowport_cfg old_cfg;
112 int i; 112 int i;
113 113
114 desc->chip->mask(irq); 114 desc->irq_data.chip->irq_mask(&desc->irq_data);
115 115
116#ifdef CONFIG_ARCH_IXDP2400 116#ifdef CONFIG_ARCH_IXDP2400
117 if (machine_is_ixdp2400()) 117 if (machine_is_ixdp2400())
@@ -133,13 +133,13 @@ static void ixdp2x00_irq_handler(unsigned int irq, struct irq_desc *desc)
133 } 133 }
134 } 134 }
135 135
136 desc->chip->unmask(irq); 136 desc->irq_data.chip->irq_unmask(&desc->irq_data);
137} 137}
138 138
139static struct irq_chip ixdp2x00_cpld_irq_chip = { 139static struct irq_chip ixdp2x00_cpld_irq_chip = {
140 .ack = ixdp2x00_irq_mask, 140 .irq_ack = ixdp2x00_irq_mask,
141 .mask = ixdp2x00_irq_mask, 141 .irq_mask = ixdp2x00_irq_mask,
142 .unmask = ixdp2x00_irq_unmask 142 .irq_unmask = ixdp2x00_irq_unmask
143}; 143};
144 144
145void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_of_irqs) 145void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_of_irqs)