[PATCH 08/11] mfd: ezx-pcap: use devm_request_irq() and devm_kzalloc()

[Jingoo Han]

Use devm_request_irq() and devm_kzalloc() to make cleanup paths
more simple.

Signed-off-by: Jingoo Han <jg1....@samsung.com>
---
 drivers/mfd/ezx-pcap.c |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index b7a61f0..8dea3a9 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -403,7 +403,6 @@ static int ezx_pcap_remove(struct spi_device *spi)
        /* cleanup ADC */
        adc_irq = pcap_to_irq(pcap, (pdata->config & PCAP_SECOND_PORT) ?
                                PCAP_IRQ_ADCDONE2 : PCAP_IRQ_ADCDONE);
-       free_irq(adc_irq, pcap);
        mutex_lock(&pcap->adc_mutex);
        for (i = 0; i < PCAP_ADC_MAXQ; i++)
                kfree(pcap->adc_queue[i]);
@@ -415,8 +414,6 @@ static int ezx_pcap_remove(struct spi_device *spi)
 
        destroy_workqueue(pcap->workqueue);
 
-       kfree(pcap);
-
        return 0;
 }
 
@@ -431,7 +428,7 @@ static int ezx_pcap_probe(struct spi_device *spi)
        if (!pdata)
                goto ret;
 
-       pcap = kzalloc(sizeof(*pcap), GFP_KERNEL);
+       pcap = devm_kzalloc(&spi->dev, sizeof(*pcap), GFP_KERNEL);
        if (!pcap) {
                ret = -ENOMEM;
                goto ret;
@@ -448,7 +445,7 @@ static int ezx_pcap_probe(struct spi_device *spi)
        spi->mode = SPI_MODE_0 | (pdata->config & PCAP_CS_AH ? SPI_CS_HIGH : 0);
        ret = spi_setup(spi);
        if (ret)
-               goto free_pcap;
+               goto ret;
 
        pcap->spi = spi;
 
@@ -458,7 +455,7 @@ static int ezx_pcap_probe(struct spi_device *spi)
        if (!pcap->workqueue) {
                ret = -ENOMEM;
                dev_err(&spi->dev, "can't create pcap thread\n");
-               goto free_pcap;
+               goto ret;
        }
 
        /* redirect interrupts to AP, except adcdone2 */
@@ -491,7 +488,8 @@ static int ezx_pcap_probe(struct spi_device *spi)
        adc_irq = pcap_to_irq(pcap, (pdata->config & PCAP_SECOND_PORT) ?
                                        PCAP_IRQ_ADCDONE2 : PCAP_IRQ_ADCDONE);
 
-       ret = request_irq(adc_irq, pcap_adc_irq, 0, "ADC", pcap);
+       ret = devm_request_irq(&spi->dev, adc_irq, pcap_adc_irq, 0,
+                               "ADC", pcap);
        if (ret)
                goto free_irqchip;
 
@@ -510,15 +508,11 @@ static int ezx_pcap_probe(struct spi_device *spi)
 
 remove_subdevs:
        device_for_each_child(&spi->dev, NULL, pcap_remove_subdev);
-/* free_adc: */
-       free_irq(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);
 /* destroy_workqueue: */
        destroy_workqueue(pcap->workqueue);
-free_pcap:
-       kfree(pcap);
 ret:
        return ret;
 }
-- 
1.7.2.5


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