Commit 9ecc2ebb authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

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



Simplifies error handling and lets us drop remove() entirely.

Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Bogdan Pricop <bogdan.pricop@emutex.com>
Reviewed-by: default avatarAlexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210516172520.1398835-8-jic23@kernel.org
parent 55364f73

drivers/iio/adc/ti-adc108s102.c

+15 −30
Original line number Diff line number Diff line
@@ -215,6 +215,11 @@ static const struct iio_info adc108s102_info = { 
	.update_scan_mode	= &adc108s102_update_scan_mode,

};



static void adc108s102_reg_disable(void *reg)

{

	regulator_disable(reg);

}



static int adc108s102_probe(struct spi_device *spi)

{

	struct adc108s102_state *st;
@@ -239,6 +244,10 @@ static int adc108s102_probe(struct spi_device *spi) 
			dev_err(&spi->dev, "Cannot enable vref regulator\n");

			return ret;

		}

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

					       st->reg);

		if (ret)

			return ret;



		ret = regulator_get_voltage(st->reg);

		if (ret < 0) {
@@ -249,7 +258,6 @@ static int adc108s102_probe(struct spi_device *spi) 
		st->va_millivolt = ret / 1000;

	}



	spi_set_drvdata(spi, indio_dev);

	st->spi = spi;



	indio_dev->name = spi->modalias;
@@ -266,40 +274,18 @@ static int adc108s102_probe(struct spi_device *spi) 
	spi_message_init_with_transfers(&st->scan_single_msg,

					&st->scan_single_xfer, 1);



	ret = iio_triggered_buffer_setup(indio_dev, NULL,

					 &adc108s102_trigger_handler, NULL);

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

					      &adc108s102_trigger_handler,

					      NULL);

	if (ret)

		goto error_disable_reg;

		return ret;



	ret = iio_device_register(indio_dev);

	if (ret) {

	ret = devm_iio_device_register(&spi->dev, indio_dev);

	if (ret)

		dev_err(&spi->dev, "Failed to register IIO device\n");

		goto error_cleanup_triggered_buffer;

	}

	return 0;



error_cleanup_triggered_buffer:

	iio_triggered_buffer_cleanup(indio_dev);



error_disable_reg:

	regulator_disable(st->reg);



	return ret;

}



static int adc108s102_remove(struct spi_device *spi)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct adc108s102_state *st = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);

	iio_triggered_buffer_cleanup(indio_dev);



	regulator_disable(st->reg);



	return 0;

}



static const struct of_device_id adc108s102_of_match[] = {

	{ .compatible = "ti,adc108s102" },

	{ }
@@ -327,7 +313,6 @@ static struct spi_driver adc108s102_driver = { 
		.acpi_match_table = ACPI_PTR(adc108s102_acpi_ids),

	},

	.probe		= adc108s102_probe,

	.remove		= adc108s102_remove,

	.id_table	= adc108s102_id,

};

module_spi_driver(adc108s102_driver);