From: Thomas Gleixner Date: Thu, 24 Mar 2011 12:29:39 +0000 (+0100) Subject: arm: Reorder irq_set_ function calls X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9323f26186403433293e87e717a7785f74f75d80;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- 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, */ 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 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) /* 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 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) 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 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, 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 0c180800c8a7..3a217be718f8 100644 --- 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 cc7bfc3428c8..70344cc75743 100644 --- 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 9a4c7aeab5c5..6d703487cb8c 100644 --- 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 aba3ffed9427..f533bdeaa72b 100644 --- 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 3c064a0176b7..9dbad70bdd09 100644 --- 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); }