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 c9d5e3fb4fd18a9b1cc06f9d3663f0dde6b58ea4..9131cdcdc64a4a30ed09dfa2697436e53a7cd14a 100644 (file)
--- 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);