diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-07-13 20:44:49 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2015-08-11 15:09:03 +0100 |
| commit | 59fa909e774d80c20cf69e98fd2ba76bcc0f3fbc (patch) | |
| tree | 065fee2adeab3a095c6c80115ea4c22c5a3e8d09 /drivers/mfd | |
| parent | 073f7f99a0054a3af6ecef1d0ce12aab9c800460 (diff) | |
mfd: jz4740: 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>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/jz4740-adc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c index b31c54e4ecb2..408291ce8af2 100644 --- a/drivers/mfd/jz4740-adc.c +++ b/drivers/mfd/jz4740-adc.c @@ -277,8 +277,7 @@ static int jz4740_adc_probe(struct platform_device *pdev) adc->gc = gc; - irq_set_handler_data(adc->irq, gc); - irq_set_chained_handler(adc->irq, jz4740_adc_irq_demux); + irq_set_chained_handler_and_data(adc->irq, jz4740_adc_irq_demux, gc); writeb(0x00, adc->base + JZ_REG_ADC_ENABLE); writeb(0xff, adc->base + JZ_REG_ADC_CTRL); @@ -308,8 +307,7 @@ static int jz4740_adc_remove(struct platform_device *pdev) irq_remove_generic_chip(adc->gc, IRQ_MSK(5), IRQ_NOPROBE | IRQ_LEVEL, 0); kfree(adc->gc); - irq_set_handler_data(adc->irq, NULL); - irq_set_chained_handler(adc->irq, NULL); + irq_set_chained_handler_and_data(adc->irq, NULL, NULL); iounmap(adc->base); release_mem_region(adc->mem->start, resource_size(adc->mem)); |