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 <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Julia Lawall <[email protected]>
Cc: Samuel Ortiz <[email protected]>
Cc: Lee Jones <[email protected]>
---
 drivers/mfd/ezx-pcap.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: tip/drivers/mfd/ezx-pcap.c
===================================================================
--- tip.orig/drivers/mfd/ezx-pcap.c
+++ tip/drivers/mfd/ezx-pcap.c
@@ -476,8 +476,7 @@ static int ezx_pcap_probe(struct spi_dev
        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 */


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to