Commit 4b36151d authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Jonathan Cameron
Browse files

iio: adc: ad_sigma_delta: remove ad_sd_{setup,cleanup}_buffer_and_trigger() 



Since all AD Sigma-Delta drivers now use the
devm_ad_sd_setup_buffer_and_trigger() function, we can remove the old
ad_sd_{setup,cleanup}_buffer_and_trigger() functions.

This way we can discourage new drivers that use the ad_sigma_delta
lib-driver to use these (older functions).

Signed-off-by: default avatarAlexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210513120752.90074-13-aardelean@deviqon.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent c066ca14

drivers/iio/adc/ad_sigma_delta.c

+0 −86
Original line number Diff line number Diff line
@@ -470,49 +470,6 @@ EXPORT_SYMBOL_GPL(ad_sd_validate_trigger); 
static const struct iio_trigger_ops ad_sd_trigger_ops = {

};



static int ad_sd_probe_trigger(struct iio_dev *indio_dev)

{

	struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev);

	int ret;



	sigma_delta->trig = iio_trigger_alloc(&sigma_delta->spi->dev,

					      "%s-dev%d", indio_dev->name,

					      iio_device_id(indio_dev));

	if (sigma_delta->trig == NULL) {

		ret = -ENOMEM;

		goto error_ret;

	}

	sigma_delta->trig->ops = &ad_sd_trigger_ops;

	init_completion(&sigma_delta->completion);



	sigma_delta->irq_dis = true;

	ret = request_irq(sigma_delta->spi->irq,

			  ad_sd_data_rdy_trig_poll,

			  sigma_delta->info->irq_flags | IRQF_NO_AUTOEN,

			  indio_dev->name,

			  sigma_delta);

	if (ret)

		goto error_free_trig;



	iio_trigger_set_drvdata(sigma_delta->trig, sigma_delta);



	ret = iio_trigger_register(sigma_delta->trig);

	if (ret)

		goto error_free_irq;



	/* select default trigger */

	indio_dev->trig = iio_trigger_get(sigma_delta->trig);



	return 0;



error_free_irq:

	free_irq(sigma_delta->spi->irq, sigma_delta);

error_free_trig:

	iio_trigger_free(sigma_delta->trig);

error_ret:

	return ret;

}



static int devm_ad_sd_probe_trigger(struct device *dev, struct iio_dev *indio_dev)

{

	struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev);
@@ -553,49 +510,6 @@ static int devm_ad_sd_probe_trigger(struct device *dev, struct iio_dev *indio_de 
	return 0;

}



static void ad_sd_remove_trigger(struct iio_dev *indio_dev)

{

	struct ad_sigma_delta *sigma_delta = iio_device_get_drvdata(indio_dev);



	iio_trigger_unregister(sigma_delta->trig);

	free_irq(sigma_delta->spi->irq, sigma_delta);

	iio_trigger_free(sigma_delta->trig);

}



/**

 * ad_sd_setup_buffer_and_trigger() -

 * @indio_dev: The IIO device

 */

int ad_sd_setup_buffer_and_trigger(struct iio_dev *indio_dev)

{

	int ret;



	ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,

			&ad_sd_trigger_handler, &ad_sd_buffer_setup_ops);

	if (ret)

		return ret;



	ret = ad_sd_probe_trigger(indio_dev);

	if (ret) {

		iio_triggered_buffer_cleanup(indio_dev);

		return ret;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(ad_sd_setup_buffer_and_trigger);



/**

 * ad_sd_cleanup_buffer_and_trigger() -

 * @indio_dev: The IIO device

 */

void ad_sd_cleanup_buffer_and_trigger(struct iio_dev *indio_dev)

{

	ad_sd_remove_trigger(indio_dev);

	iio_triggered_buffer_cleanup(indio_dev);

}

EXPORT_SYMBOL_GPL(ad_sd_cleanup_buffer_and_trigger);



/**

 * devm_ad_sd_setup_buffer_and_trigger() - Device-managed buffer & trigger setup

 * @dev: Device object to which to bind the life-time of the resources attached

include/linux/iio/adc/ad_sigma_delta.h

+0 −3
Original line number Diff line number Diff line
@@ -133,9 +133,6 @@ int ad_sd_calibrate_all(struct ad_sigma_delta *sigma_delta, 
int ad_sd_init(struct ad_sigma_delta *sigma_delta, struct iio_dev *indio_dev,

	struct spi_device *spi, const struct ad_sigma_delta_info *info);



int ad_sd_setup_buffer_and_trigger(struct iio_dev *indio_dev);

void ad_sd_cleanup_buffer_and_trigger(struct iio_dev *indio_dev);



int devm_ad_sd_setup_buffer_and_trigger(struct device *dev, struct iio_dev *indio_dev);



int ad_sd_validate_trigger(struct iio_dev *indio_dev, struct iio_trigger *trig);