aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/common
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-24 08:29:39 -0400
committerThomas Gleixner <tglx@linutronix.de>2011-03-29 08:47:58 -0400
commit9323f26186403433293e87e717a7785f74f75d80 (patch)
tree612ef29f951838dc4bf53589bdfd5e1368951234 /arch/arm/common
parent6845664a6a7d443f03883db59d10749d38d98b8e (diff)
arm: Reorder irq_set_ function calls
Reorder irq_set_chip() irq_set_chip_data() irq_set_handler() to irq_set_chip() irq_set_handler() irq_set_chip_data() so the next patch can combine irq_set_chip() and irq_set_handler() to irq_set_chip_and_handler(). Automated conversion with coccinelle. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/common')
-rw-r--r--arch/arm/common/gic.c2
-rw-r--r--arch/arm/common/locomo.c2
-rw-r--r--arch/arm/common/sa1111.c4
-rw-r--r--arch/arm/common/vic.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index 50d5b20d5c93..630d46b5ab82 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -320,8 +320,8 @@ static void __init gic_dist_init(struct gic_chip_data *gic,
320 */ 320 */
321 for (i = irq_start; i < irq_limit; i++) { 321 for (i = irq_start; i < irq_limit; i++) {
322 irq_set_chip(i, &gic_chip); 322 irq_set_chip(i, &gic_chip);
323 irq_set_chip_data(i, gic);
324 irq_set_handler(i, handle_level_irq); 323 irq_set_handler(i, handle_level_irq);
324 irq_set_chip_data(i, gic);
325 set_irq_flags(i, IRQF_VALID | IRQF_PROBE); 325 set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
326 } 326 }
327 327
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index ea18b351f205..54d91f8607e7 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -204,8 +204,8 @@ static void locomo_setup_irq(struct locomo *lchip)
204 /* Install handlers for IRQ_LOCOMO_* */ 204 /* Install handlers for IRQ_LOCOMO_* */
205 for ( ; irq <= lchip->irq_base + 3; irq++) { 205 for ( ; irq <= lchip->irq_base + 3; irq++) {
206 irq_set_chip(irq, &locomo_chip); 206 irq_set_chip(irq, &locomo_chip);
207 irq_set_chip_data(irq, lchip);
208 irq_set_handler(irq, handle_level_irq); 207 irq_set_handler(irq, handle_level_irq);
208 irq_set_chip_data(irq, lchip);
209 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); 209 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
210 } 210 }
211} 211}
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 11ab3c24103c..f098f5c9fa3e 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -473,15 +473,15 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
473 473
474 for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) { 474 for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) {
475 irq_set_chip(irq, &sa1111_low_chip); 475 irq_set_chip(irq, &sa1111_low_chip);
476 irq_set_chip_data(irq, sachip);
477 irq_set_handler(irq, handle_edge_irq); 476 irq_set_handler(irq, handle_edge_irq);
477 irq_set_chip_data(irq, sachip);
478 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); 478 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
479 } 479 }
480 480
481 for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) { 481 for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {
482 irq_set_chip(irq, &sa1111_high_chip); 482 irq_set_chip(irq, &sa1111_high_chip);
483 irq_set_chip_data(irq, sachip);
484 irq_set_handler(irq, handle_edge_irq); 483 irq_set_handler(irq, handle_edge_irq);
484 irq_set_chip_data(irq, sachip);
485 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); 485 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
486 } 486 }
487 487
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 297078b4dd30..e282fd1a436a 100644
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
@@ -306,8 +306,8 @@ static void __init vic_set_irq_sources(void __iomem *base,
306 unsigned int irq = irq_start + i; 306 unsigned int irq = irq_start + i;
307 307
308 irq_set_chip(irq, &vic_chip); 308 irq_set_chip(irq, &vic_chip);
309 irq_set_chip_data(irq, base);
310 irq_set_handler(irq, handle_level_irq); 309 irq_set_handler(irq, handle_level_irq);
310 irq_set_chip_data(irq, base);
311 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); 311 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
312 } 312 }
313 } 313 }