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-tegra | |
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-tegra')
-rw-r--r-- | arch/arm/mach-tegra/gpio.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-tegra/irq.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/gpio.c b/arch/arm/mach-tegra/gpio.c index 4148048..76a3f65 100644 --- a/arch/arm/mach-tegra/gpio.c +++ b/arch/arm/mach-tegra/gpio.c @@ -342,8 +342,8 @@ static int __init tegra_gpio_init(void) irq_set_lockdep_class(i, &gpio_lock_class); irq_set_chip_data(i, bank); - irq_set_chip(i, &tegra_gpio_irq_chip); - irq_set_handler(i, handle_simple_irq); + irq_set_chip_and_handler(i, &tegra_gpio_irq_chip, + handle_simple_irq); set_irq_flags(i, IRQF_VALID); } diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c index 6b5c8b8..4330d89 100644 --- a/arch/arm/mach-tegra/irq.c +++ b/arch/arm/mach-tegra/irq.c @@ -154,8 +154,7 @@ void __init tegra_init_irq(void) for (i = 0; i < INT_MAIN_NR; i++) { irq = INT_PRI_BASE + i; - irq_set_chip(irq, &tegra_irq); - irq_set_handler(irq, handle_level_irq); + irq_set_chip_and_handler(irq, &tegra_irq, handle_level_irq); set_irq_flags(irq, IRQF_VALID); } } |