summaryrefslogtreecommitdiffstats
path: root/arch/arm/common/locomo.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-06-22 09:08:11 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-07-13 14:59:14 +0200
commit6d0786acda39def7c299aec6b9fe24388c2deee6 (patch)
tree25438fce13b1d30cb716ce92a4a56a3fdde75458 /arch/arm/common/locomo.c
parent206287c2c8dd61b5316c0dab459208e82d68e48d (diff)
downloadlinux-stable-6d0786acda39def7c299aec6b9fe24388c2deee6.tar.gz
linux-stable-6d0786acda39def7c299aec6b9fe24388c2deee6.tar.bz2
linux-stable-6d0786acda39def7c299aec6b9fe24388c2deee6.zip
ARM/locomo: 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 <linux+kernel@arm.linux.org.uk> Cc: linux-arm-kernel@lists.infradead.org
Diffstat (limited to 'arch/arm/common/locomo.c')
-rw-r--r--arch/arm/common/locomo.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index b55c3625d7ee..133b78e9ff7b 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -475,8 +475,7 @@ static void __locomo_remove(struct locomo *lchip)
device_for_each_child(lchip->dev, NULL, locomo_remove_child);
if (lchip->irq != NO_IRQ) {
- irq_set_chained_handler(lchip->irq, NULL);
- irq_set_handler_data(lchip->irq, NULL);
+ irq_set_chained_handler_and_data(lchip->irq, NULL, NULL);
}
iounmap(lchip->base);