Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ba895e0 authored by Jingoo Han's avatar Jingoo Han Committed by Samuel Ortiz
Browse files

mfd: ezx-pcap: Use devm_*() functions 



Use devm_*() functions to make cleanup paths more simple.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 990810b0

drivers/mfd/ezx-pcap.c

+7 −10
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ 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);

	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]);
@@ -415,8 +415,6 @@ static int ezx_pcap_remove(struct spi_device *spi) 


	destroy_workqueue(pcap->workqueue);



	kfree(pcap);



	return 0;

}
@@ -431,7 +429,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 +446,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 +456,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 +489,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;
@@ -511,14 +510,12 @@ 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);

	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);

/* destroy_workqueue: */

	destroy_workqueue(pcap->workqueue);

free_pcap:

	kfree(pcap);

ret:

	return ret;

}