diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-09-25 15:37:45 +0800 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2013-10-23 16:21:17 +0100 |
| commit | 89720264a1f0870e45f583583357ee986e216157 (patch) | |
| tree | 1265a2316b81ff49d1e0b74179fbae0677856849 /drivers/mfd/ezx-pcap.c | |
| parent | e90f875419967589d75d1a3e2b89c5f2720e794e (diff) | |
| download | linux-stable-89720264a1f0870e45f583583357ee986e216157.tar.gz linux-stable-89720264a1f0870e45f583583357ee986e216157.tar.bz2 linux-stable-89720264a1f0870e45f583583357ee986e216157.zip | |
mfd: ezx-pcap: Drop devm_free_irq of devm_ allocated irq
The devm_request_irq function allocates irq that is released
when a driver detaches. Thus, there is no reason to explicitly
call devm_free_irq in probe or remove functions.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/ezx-pcap.c')
| -rw-r--r-- | drivers/mfd/ezx-pcap.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index 7245b0c5b794..2ed774e7d342 100644 --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c @@ -394,16 +394,12 @@ static int pcap_add_subdev(struct pcap_chip *pcap, static int ezx_pcap_remove(struct spi_device *spi) { struct pcap_chip *pcap = spi_get_drvdata(spi); - struct pcap_platform_data *pdata = dev_get_platdata(&spi->dev); - int i, adc_irq; + int i; /* remove all registered subdevs */ device_for_each_child(&spi->dev, NULL, pcap_remove_subdev); /* cleanup ADC */ - adc_irq = pcap_to_irq(pcap, (pdata->config & PCAP_SECOND_PORT) ? - PCAP_IRQ_ADCDONE2 : PCAP_IRQ_ADCDONE); - devm_free_irq(&spi->dev, adc_irq, pcap); mutex_lock(&pcap->adc_mutex); for (i = 0; i < PCAP_ADC_MAXQ; i++) kfree(pcap->adc_queue[i]); @@ -509,8 +505,6 @@ static int ezx_pcap_probe(struct spi_device *spi) remove_subdevs: device_for_each_child(&spi->dev, NULL, pcap_remove_subdev); -/* free_adc: */ - devm_free_irq(&spi->dev, adc_irq, pcap); free_irqchip: for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++) irq_set_chip_and_handler(i, NULL, NULL); |