diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-03-24 13:35:09 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-03-29 14:47:58 +0200 |
| commit | f38c02f3b338651e145aac2889ba976baf6b28b3 (patch) | |
| tree | 30cfbf42ccff4a9dc26d95e9058ec76f5fde78bb /arch/arm/mach-exynos4 | |
| parent | 9323f26186403433293e87e717a7785f74f75d80 (diff) | |
| download | op-kernel-dev-f38c02f3b338651e145aac2889ba976baf6b28b3.zip op-kernel-dev-f38c02f3b338651e145aac2889ba976baf6b28b3.tar.gz | |
arm: Fold irq_set_chip/irq_set_handler
Use irq_set_chip_and_handler() instead. Converted with coccinelle.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/mach-exynos4')
| -rw-r--r-- | arch/arm/mach-exynos4/irq-combiner.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-exynos4/irq-eint.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos4/irq-combiner.c b/arch/arm/mach-exynos4/irq-combiner.c index 3a217be..f488b66 100644 --- a/arch/arm/mach-exynos4/irq-combiner.c +++ b/arch/arm/mach-exynos4/irq-combiner.c @@ -119,8 +119,7 @@ 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_handler(i, handle_level_irq); + irq_set_chip_and_handler(i, &combiner_chip, 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-exynos4/irq-eint.c b/arch/arm/mach-exynos4/irq-eint.c index 0441dfc..9d87d2a 100644 --- a/arch/arm/mach-exynos4/irq-eint.c +++ b/arch/arm/mach-exynos4/irq-eint.c @@ -208,8 +208,8 @@ int __init exynos4_init_irq_eint(void) int irq; for (irq = 0 ; irq <= 31 ; irq++) { - irq_set_chip(IRQ_EINT(irq), &exynos4_irq_eint); - irq_set_handler(IRQ_EINT(irq), handle_level_irq); + irq_set_chip_and_handler(IRQ_EINT(irq), &exynos4_irq_eint, + handle_level_irq); set_irq_flags(IRQ_EINT(irq), IRQF_VALID); } |
