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>

diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index 50d5b20d5c93c7283f7c456ae19e582bb56835f5..630d46b5ab828b056a2f8b75af0438093dee0c3a 100644 (file)
--- 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,
         */
        for (i = irq_start; i < irq_limit; i++) {
                irq_set_chip(i, &gic_chip);
-               irq_set_chip_data(i, gic);
                irq_set_handler(i, handle_level_irq);
+               irq_set_chip_data(i, gic);
                set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
        }
 

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index ea18b351f205978f32298a45824b6e8586cfc12a..54d91f8607e79507250bead0d4f6c7e20b02e12f 100644 (file)
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -204,8 +204,8 @@ static void locomo_setup_irq(struct locomo *lchip)
        /* Install handlers for IRQ_LOCOMO_* */
        for ( ; irq <= lchip->irq_base + 3; irq++) {
                irq_set_chip(irq, &locomo_chip);
-               irq_set_chip_data(irq, lchip);
                irq_set_handler(irq, handle_level_irq);
+               irq_set_chip_data(irq, lchip);
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
        }
 }

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 11ab3c24103c5c46cf818aba8ddc8c1ba0576664..f098f5c9fa3e0bc0bb80f8eaefafe05e422e432c 100644 (file)
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -473,15 +473,15 @@ static void sa1111_setup_irq(struct sa1111 *sachip)
 
        for (irq = IRQ_GPAIN0; irq <= SSPROR; irq++) {
                irq_set_chip(irq, &sa1111_low_chip);
-               irq_set_chip_data(irq, sachip);
                irq_set_handler(irq, handle_edge_irq);
+               irq_set_chip_data(irq, sachip);
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
        }
 
        for (irq = AUDXMTDMADONEA; irq <= IRQ_S1_BVD1_STSCHG; irq++) {
                irq_set_chip(irq, &sa1111_high_chip);
-               irq_set_chip_data(irq, sachip);
                irq_set_handler(irq, handle_edge_irq);
+               irq_set_chip_data(irq, sachip);
                set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
        }
 

diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c
index 297078b4dd300bf543667ed331837cb09cb54979..e282fd1a436aa54c8a5f8ca381a059217202af9e 100644 (file)
--- 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,
                        unsigned int irq = irq_start + i;
 
                        irq_set_chip(irq, &vic_chip);
-                       irq_set_chip_data(irq, base);
                        irq_set_handler(irq, handle_level_irq);
+                       irq_set_chip_data(irq, base);
                        set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
                }
        }

diff --git a/arch/arm/mach-exynos4/irq-combiner.c b/arch/arm/mach-exynos4/irq-combiner.c
index 0c180800c8a792cb1e5bb17102571a65a8c7f9ec..3a217be718f8f018945e3128e7045f32bcba3cbb 100644 (file)
--- a/arch/arm/mach-exynos4/irq-combiner.c
+++ b/arch/arm/mach-exynos4/irq-combiner.c
@@ -120,8 +120,8 @@ void __init combiner_init(unsigned int combiner_nr, void __iomem *base,
        for (i = irq_start; i < combiner_data[combiner_nr].irq_offset
                                + MAX_IRQ_IN_COMBINER; i++) {
                irq_set_chip(i, &combiner_chip);
-               irq_set_chip_data(i, &combiner_data[combiner_nr]);
                irq_set_handler(i, handle_level_irq);
+               irq_set_chip_data(i, &combiner_data[combiner_nr]);
                set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
        }
 }

diff --git a/arch/arm/mach-pxa/irq.c b/arch/arm/mach-pxa/irq.c
index cc7bfc3428c8f2807758a08d4da53fad6296b2f6..70344cc75743c922be47234de7bfa3a6b7517aef 100644 (file)
--- a/arch/arm/mach-pxa/irq.c
+++ b/arch/arm/mach-pxa/irq.c
@@ -138,8 +138,8 @@ static void __init pxa_init_low_gpio_irq(set_wake_t fn)
 
        for (irq = IRQ_GPIO0; irq <= IRQ_GPIO1; irq++) {
                irq_set_chip(irq, &pxa_low_gpio_chip);
-               irq_set_chip_data(irq, irq_base(0));
                irq_set_handler(irq, handle_edge_irq);
+               irq_set_chip_data(irq, irq_base(0));
                set_irq_flags(irq, IRQF_VALID);
        }
 
@@ -166,8 +166,8 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
 
                        irq = PXA_IRQ(i);
                        irq_set_chip(irq, &pxa_internal_irq_chip);
-                       irq_set_chip_data(irq, base);
                        irq_set_handler(irq, handle_level_irq);
+                       irq_set_chip_data(irq, base);
                        set_irq_flags(irq, IRQF_VALID);
                }
        }

diff --git a/arch/arm/mach-s3c64xx/irq-eint.c b/arch/arm/mach-s3c64xx/irq-eint.c
index 9a4c7aeab5c5915083bd56faca94bf495a7a2793..6d703487cb8cf81929f32c9cdacd99ff7e055710 100644 (file)
--- a/arch/arm/mach-s3c64xx/irq-eint.c
+++ b/arch/arm/mach-s3c64xx/irq-eint.c
@@ -198,8 +198,8 @@ static int __init s3c64xx_init_irq_eint(void)
 
        for (irq = IRQ_EINT(0); irq <= IRQ_EINT(27); irq++) {
                irq_set_chip(irq, &s3c_irq_eint);
-               irq_set_chip_data(irq, (void *)eint_irq_to_bit(irq));
                irq_set_handler(irq, handle_level_irq);
+               irq_set_chip_data(irq, (void *)eint_irq_to_bit(irq));
                set_irq_flags(irq, IRQF_VALID);
        }
 

diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c
index aba3ffed942751b0f031c0828a51401ffdad22c9..f533bdeaa72bad9c6beba0a6f2120543785fd8a7 100644 (file)
--- a/arch/arm/plat-orion/irq.c
+++ b/arch/arm/plat-orion/irq.c
@@ -57,8 +57,8 @@ void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
                unsigned int irq = irq_start + i;
 
                irq_set_chip(irq, &orion_irq_chip);
-               irq_set_chip_data(irq, maskaddr);
                irq_set_handler(irq, handle_level_irq);
+               irq_set_chip_data(irq, maskaddr);
                irq_set_status_flags(irq, IRQ_LEVEL);
                set_irq_flags(irq, IRQF_VALID);
        }

diff --git a/arch/arm/plat-samsung/irq-uart.c b/arch/arm/plat-samsung/irq-uart.c
index 3c064a0176b70015aa3076ef5b0552768934f3b6..9dbad70bdd09784b3cc2b70b65a48a566293ea64 100644 (file)
--- a/arch/arm/plat-samsung/irq-uart.c
+++ b/arch/arm/plat-samsung/irq-uart.c
@@ -118,8 +118,8 @@ static void __init s3c_init_uart_irq(struct s3c_uart_irq *uirq)
                irq = uirq->base_irq + offs;
 
                irq_set_chip(irq, &s3c_irq_uart);
-               irq_set_chip_data(irq, uirq);
                irq_set_handler(irq, handle_level_irq);
+               irq_set_chip_data(irq, uirq);
                set_irq_flags(irq, IRQF_VALID);
        }