diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-21 21:25:10 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2015-07-13 14:59:14 +0200 |
commit | 206287c2c8dd61b5316c0dab459208e82d68e48d (patch) | |
tree | de35f3f3dfe2157ffc4cda5f9d99a671c66fed26 | |
parent | e49251988b10e8787baa5f3d8ffd154e003f0963 (diff) | |
download | op-kernel-dev-206287c2c8dd61b5316c0dab459208e82d68e48d.zip op-kernel-dev-206287c2c8dd61b5316c0dab459208e82d68e48d.tar.gz |
ARM/orion: Consolidate chained IRQ handler install/remove
Chained irq handlers usually set up handler data as well. We now have
a function to set both under irq_desc->lock. Replace the two calls
with one.
Search and conversion was done with coccinelle.
Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
-rw-r--r-- | arch/arm/plat-orion/gpio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c index 5168a52..4a347de 100644 --- a/arch/arm/plat-orion/gpio.c +++ b/arch/arm/plat-orion/gpio.c @@ -582,8 +582,9 @@ void __init orion_gpio_init(struct device_node *np, for (i = 0; i < 4; i++) { if (irqs[i]) { - irq_set_handler_data(irqs[i], ochip); - irq_set_chained_handler(irqs[i], gpio_irq_handler); + irq_set_chained_handler_and_data(irqs[i], + gpio_irq_handler, + ochip); } } |