diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-07-13 22:44:46 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2015-08-11 16:09:01 +0200 |
| commit | c89fc9ac88ad99c0e629204d1b62af57367fd32d (patch) | |
| tree | 0726869b001f2ee624f441b05811bcd194a73b5e | |
| parent | mfd: Kill off set_irq_flags usage (diff) | |
| download | linux-c89fc9ac88ad99c0e629204d1b62af57367fd32d.tar.xz linux-c89fc9ac88ad99c0e629204d1b62af57367fd32d.zip | |
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>
| -rw-r--r-- | drivers/mfd/ezx-pcap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index 19e55dd97a4e..ab36802b008b 100644 --- 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 */ |