diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-11-23 06:41:32 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-11-30 07:24:47 -0500 |
commit | 10dd5ce28d78e2440e8fa1135d17e33399d75340 (patch) | |
tree | d2e76765a57e7e47a9c424f99c3a22bf99c6da64 /arch/arm/common/sa1111.c | |
parent | 127e477e0cd8da4d3058709ab2dc7b92dccbcba5 (diff) |
[ARM] Remove compatibility layer for ARM irqs
set_irq_chipdata -> set_irq_chip_data
get_irq_chipdata -> get_irq_chip_data
do_level_IRQ -> handle_level_irq
do_edge_IRQ -> handle_edge_irq
do_simple_IRQ -> handle_simple_irq
irqdesc -> irq_desc
irqchip -> irq_chip
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common/sa1111.c')
-rw-r--r-- | arch/arm/common/sa1111.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index d5f72010a6f3..fe3f05901a23 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
@@ -147,7 +147,7 @@ void __init sa1111_adjust_zones(int node, unsigned long *size, unsigned long *ho | |||
147 | * will call us again if there are more interrupts to process. | 147 | * will call us again if there are more interrupts to process. |
148 | */ | 148 | */ |
149 | static void | 149 | static void |
150 | sa1111_irq_handler(unsigned int irq, struct irqdesc *desc) | 150 | sa1111_irq_handler(unsigned int irq, struct irq_desc *desc) |
151 | { | 151 | { |
152 | unsigned int stat0, stat1, i; | 152 | unsigned int stat0, stat1, i; |
153 | void __iomem *base = get_irq_data(irq); | 153 | void __iomem *base = get_irq_data(irq); |
@@ -187,7 +187,7 @@ static void sa1111_ack_irq(unsigned int irq) | |||
187 | 187 | ||
188 | static void sa1111_mask_lowirq(unsigned int irq) | 188 | static void sa1111_mask_lowirq(unsigned int irq) |
189 | { | 189 | { |
190 | void __iomem *mapbase = get_irq_chipdata(irq); | 190 | void __iomem *mapbase = get_irq_chip_data(irq); |
191 | unsigned long ie0; | 191 | unsigned long ie0; |
192 | 192 | ||
193 | ie0 = sa1111_readl(mapbase + SA1111_INTEN0); | 193 | ie0 = sa1111_readl(mapbase + SA1111_INTEN0); |
@@ -197,7 +197,7 @@ static void sa1111_mask_lowirq(unsigned int irq) | |||
197 | 197 | ||
198 | static void sa1111_unmask_lowirq(unsigned int irq) | 198 | static void sa1111_unmask_lowirq(unsigned int irq) |
199 | { | 199 | { |
200 | void __iomem *mapbase = get_irq_chipdata(irq); | 200 | void __iomem *mapbase = get_irq_chip_data(irq); |
201 | unsigned long ie0; | 201 | unsigned long ie0; |
202 | 202 | ||
203 | ie0 = sa1111_readl(mapbase + SA1111_INTEN0); | 203 | ie0 = sa1111_readl(mapbase + SA1111_INTEN0); |
@@ -215,7 +215,7 @@ static void sa1111_unmask_lowirq(unsigned int irq) | |||
215 | static int sa1111_retrigger_lowirq(unsigned int irq) | 215 | static int sa1111_retrigger_lowirq(unsigned int irq) |
216 | { | 216 | { |
217 | unsigned int mask = SA1111_IRQMASK_LO(irq); | 217 | unsigned int mask = SA1111_IRQMASK_LO(irq); |
218 | void __iomem *mapbase = get_irq_chipdata(irq); | 218 | void __iomem *mapbase = get_irq_chip_data(irq); |
219 | unsigned long ip0; | 219 | unsigned long ip0; |
220 | int i; | 220 | int i; |
221 | 221 | ||
@@ -236,7 +236,7 @@ static int sa1111_retrigger_lowirq(unsigned int irq) | |||
236 | static int sa1111_type_lowirq(unsigned int irq, unsigned int flags) | 236 | static int sa1111_type_lowirq(unsigned int irq, unsigned int flags) |
237 | { | 237 | { |
238 | unsigned int mask = SA1111_IRQMASK_LO(irq); | 238 | unsigned int mask = SA1111_IRQMASK_LO(irq); |
239 | void __iomem *mapbase = get_irq_chipdata(irq); | 239 | void __iomem *mapbase = get_irq_chip_data(irq); |
240 | unsigned long ip0; | 240 | unsigned long ip0; |
241 | 241 | ||
242 | if (flags == IRQT_PROBE) | 242 | if (flags == IRQT_PROBE) |
@@ -259,7 +259,7 @@ static int sa1111_type_lowirq(unsigned int irq, unsigned int flags) | |||
259 | static int sa1111_wake_lowirq(unsigned int irq, unsigned int on) | 259 | static int sa1111_wake_lowirq(unsigned int irq, unsigned int on) |
260 | { | 260 | { |
261 | unsigned int mask = SA1111_IRQMASK_LO(irq); | 261 | unsigned int mask = SA1111_IRQMASK_LO(irq); |
262 | void __iomem *mapbase = get_irq_chipdata(irq); | 262 | void __iomem *mapbase = get_irq_chip_data(irq); |
263 | unsigned long we0; | 263 | unsigned long we0; |
264 | 264 | ||
265 | we0 = sa1111_readl(mapbase + SA1111_WAKEEN0); | 265 | we0 = sa1111_readl(mapbase + SA1111_WAKEEN0); |
@@ -284,7 +284,7 @@ static struct irq_chip sa1111_low_chip = { | |||
284 | 284 | ||
285 | static void sa1111_mask_highirq(unsigned int irq) | 285 | static void sa1111_mask_highirq(unsigned int irq) |
286 | { | 286 | { |
287 | void __iomem *mapbase = get_irq_chipdata(irq); | 287 | void __iomem *mapbase = get_irq_chip_data(irq); |
288 | unsigned long ie1; | 288 | unsigned long ie1; |
289 | 289 | ||
290 | ie1 = sa1111_readl(mapbase + SA1111_INTEN1); | 290 | ie1 = sa1111_readl(mapbase + SA1111_INTEN1); |
@@ -294,7 +294,7 @@ static void sa1111_mask_highirq(unsigned int irq) | |||
294 | 294 | ||
295 | static void sa1111_unmask_highirq(unsigned int irq) | 295 | static void sa1111_unmask_highirq(unsigned int irq) |
296 | { | 296 | { |
297 | void __iomem *mapbase = get_irq_chipdata(irq); | 297 | void __iomem *mapbase = get_irq_chip_data(irq); |
298 | unsigned long ie1; | 298 | unsigned long ie1; |
299 | 299 | ||
300 | ie1 = sa1111_readl(mapbase + SA1111_INTEN1); | 300 | ie1 = sa1111_readl(mapbase + SA1111_INTEN1); |
@@ -312,7 +312,7 @@ static void sa1111_unmask_highirq(unsigned int irq) | |||
312 | static int sa1111_retrigger_highirq(unsigned int irq) | 312 | static int sa1111_retrigger_highirq(unsigned int irq) |
313 | { | 313 | { |
314 | unsigned int mask = SA1111_IRQMASK_HI(irq); | 314 | unsigned int mask = SA1111_IRQMASK_HI(irq); |
315 | void __iomem *mapbase = get_irq_chipdata(irq); | 315 | void __iomem *mapbase = get_irq_chip_data(irq); |
316 | unsigned long ip1; | 316 | unsigned long ip1; |
317 | int i; | 317 | int i; |
318 | 318 | ||
@@ -333,7 +333,7 @@ static int sa1111_retrigger_highirq(unsigned int irq) | |||
333 | static int sa1111_type_highirq(unsigned int irq, unsigned int flags) | 333 | static int sa1111_type_highirq(unsigned int irq, unsigned int flags) |
334 | { | 334 | { |
335 | unsigned int mask = SA1111_IRQMASK_HI(irq); | 335 | unsigned int mask = SA1111_IRQMASK_HI(irq); |
336 | void __iomem *mapbase = get_irq_chipdata(irq); | 336 | void __iomem *mapbase = get_irq_chip_data(irq); |
337 | unsigned long ip1; | 337 | unsigned long ip1; |
338 | 338 | ||
339 | if (flags == IRQT_PROBE) | 339 | if (flags == IRQT_PROBE) |
@@ -356,7 +356,7 @@ static int sa1111_type_highirq(unsigned int irq, unsigned int flags) | |||
356 | static int sa1111_wake_highirq(unsigned int irq, unsigned int on) | 356 | static int sa1111_wake_highirq(unsigned int irq, unsigned int on) |
357 | { | 357 | { |
358 | unsigned int mask = SA1111_IRQMASK_HI(irq); | 358 | unsigned int mask = SA1111_IRQMASK_HI(irq); |
359 | void __iomem *mapbase = get_irq_chipdata(irq); | 359 | void __iomem *mapbase = get_irq_chip_data(irq); |
360 | unsigned long we1; | 360 | unsigned long we1; |
361 | 361 | ||
362 | we1 = sa1111_readl(mapbase + SA1111_WAKEEN1); | 362 | we1 = sa1111_readl(mapbase + SA1111_WAKEEN1); |
@@ -410,15 +410,15 @@ static void sa1111_setup_irq(struct sa1111 *sachip) | |||
410 | 410 | ||
411 | for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) { | 411 | for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) { |
412 | set_irq_chip(irq, &sa1111_low_chip); | 412 | set_irq_chip(irq, &sa1111_low_chip); |
413 | set_irq_chipdata(irq, irqbase); | 413 | set_irq_chip_data(irq, irqbase); |
414 | set_irq_handler(irq, do_edge_IRQ); | 414 | set_irq_handler(irq, handle_edge_irq); |
415 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | 415 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
416 | } | 416 | } |
417 | 417 | ||
418 | for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) { | 418 | for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) { |
419 | set_irq_chip(irq, &sa1111_high_chip); | 419 | set_irq_chip(irq, &sa1111_high_chip); |
420 | set_irq_chipdata(irq, irqbase); | 420 | set_irq_chip_data(irq, irqbase); |
421 | set_irq_handler(irq, do_edge_IRQ); | 421 | set_irq_handler(irq, handle_edge_irq); |
422 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); | 422 | set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); |
423 | } | 423 | } |
424 | 424 | ||