From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 13 Jul 2015 20:44:47 +0000 (+0000)
Subject: mfd: htc-egpio: Consolidate chained IRQ handler install/remove
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=073f7f99a0054a3af6ecef1d0ce12aab9c800460;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

mfd: htc-egpio: 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>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---

diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c
index c9d5e3fb4fd1..9131cdcdc64a 100644
--- a/drivers/mfd/htc-egpio.c
+++ b/drivers/mfd/htc-egpio.c
@@ -353,8 +353,8 @@ static int __init egpio_probe(struct platform_device *pdev)
 			irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE);
 		}
 		irq_set_irq_type(ei->chained_irq, IRQ_TYPE_EDGE_RISING);
-		irq_set_handler_data(ei->chained_irq, ei);
-		irq_set_chained_handler(ei->chained_irq, egpio_handler);
+		irq_set_chained_handler_and_data(ei->chained_irq,
+						 egpio_handler, ei);
 		ack_irqs(ei);
 
 		device_init_wakeup(&pdev->dev, 1);