Commit 55364f73 authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

iio: adc: ti-adc0832: Use devm managed functions for all of probe() 



Simplifies error handling, plus allows us to drop the remove()
function entirely.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Reviewed-by: default avatarAlexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210516172520.1398835-7-jic23@kernel.org
parent 6c100eb9

drivers/iio/adc/ti-adc0832.c

+12 −27
Original line number Diff line number Diff line
@@ -236,6 +236,11 @@ static irqreturn_t adc0832_trigger_handler(int irq, void *p) 
	return IRQ_HANDLED;

}



static void adc0832_reg_disable(void *reg)

{

	regulator_disable(reg);

}



static int adc0832_probe(struct spi_device *spi)

{

	struct iio_dev *indio_dev;
@@ -287,36 +292,17 @@ static int adc0832_probe(struct spi_device *spi) 
	if (ret)

		return ret;



	spi_set_drvdata(spi, indio_dev);



	ret = iio_triggered_buffer_setup(indio_dev, NULL,

					 adc0832_trigger_handler, NULL);

	ret = devm_add_action_or_reset(&spi->dev, adc0832_reg_disable,

				       adc->reg);

	if (ret)

		goto err_reg_disable;

		return ret;



	ret = iio_device_register(indio_dev);

	ret = devm_iio_triggered_buffer_setup(&spi->dev, indio_dev, NULL,

					      adc0832_trigger_handler, NULL);

	if (ret)

		goto err_buffer_cleanup;



	return 0;

err_buffer_cleanup:

	iio_triggered_buffer_cleanup(indio_dev);

err_reg_disable:

	regulator_disable(adc->reg);



		return ret;

}



static int adc0832_remove(struct spi_device *spi)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct adc0832 *adc = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);

	iio_triggered_buffer_cleanup(indio_dev);

	regulator_disable(adc->reg);



	return 0;

	return devm_iio_device_register(&spi->dev, indio_dev);

}



static const struct of_device_id adc0832_dt_ids[] = {
@@ -343,7 +329,6 @@ static struct spi_driver adc0832_driver = { 
		.of_match_table = adc0832_dt_ids,

	},

	.probe = adc0832_probe,

	.remove = adc0832_remove,

	.id_table = adc0832_id,

};

module_spi_driver(adc0832_driver);