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-mxs | |
| parent | arm: Reorder irq_set_ function calls (diff) | |
| download | linux-f38c02f3b338651e145aac2889ba976baf6b28b3.tar.xz linux-f38c02f3b338651e145aac2889ba976baf6b28b3.zip | |
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-mxs')
| -rw-r--r-- | arch/arm/mach-mxs/gpio.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/icoll.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-mxs/gpio.c b/arch/arm/mach-mxs/gpio.c index a1e01dd4a4ff..2c950fef71a8 100644 --- a/arch/arm/mach-mxs/gpio.c +++ b/arch/arm/mach-mxs/gpio.c @@ -265,8 +265,8 @@ int __init mxs_gpio_init(struct mxs_gpio_port *port, int cnt) for (j = port[i].virtual_irq_start; j < port[i].virtual_irq_start + 32; j++) { - irq_set_chip(j, &gpio_irq_chip); - irq_set_handler(j, handle_level_irq); + irq_set_chip_and_handler(j, &gpio_irq_chip, + handle_level_irq); set_irq_flags(j, IRQF_VALID); } diff --git a/arch/arm/mach-mxs/icoll.c b/arch/arm/mach-mxs/icoll.c index ae8a0d98f995..23ca9d083b2c 100644 --- a/arch/arm/mach-mxs/icoll.c +++ b/arch/arm/mach-mxs/icoll.c @@ -74,8 +74,7 @@ void __init icoll_init_irq(void) mxs_reset_block(icoll_base + HW_ICOLL_CTRL); for (i = 0; i < MXS_INTERNAL_IRQS; i++) { - irq_set_chip(i, &mxs_icoll_chip); - irq_set_handler(i, handle_level_irq); + irq_set_chip_and_handler(i, &mxs_icoll_chip, handle_level_irq); set_irq_flags(i, IRQF_VALID); } } |