mfd: ezx-pcap: 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/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index 19e55dd97a4e389029449ce1c440ecc6c9e14e89..ab36802b008b3b79d5076340a34b8bf7c3991ca9 100644 (file)
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -472,8 +472,7 @@ static int ezx_pcap_probe(struct spi_device *spi)
        pcap->msr = PCAP_MASK_ALL_INTERRUPT;
 
        irq_set_irq_type(spi->irq, IRQ_TYPE_EDGE_RISING);
-       irq_set_handler_data(spi->irq, pcap);
-       irq_set_chained_handler(spi->irq, pcap_irq_handler);
+       irq_set_chained_handler_and_data(spi->irq, pcap_irq_handler, pcap);
        irq_set_irq_wake(spi->irq, 1);
 
        /* ADC */