Commit 5a9b7ca6 authored by Nuno Sá's avatar Nuno Sá Committed by Jonathan Cameron
Browse files

iio: adis16260: Use Managed device functions 



Use the adis managed device functions to setup the buffer and the trigger.
The ultimate goal will be to completely drop the non devm version from
the lib.

Since we are here, drop the `.remove` callback by further using devm
functions.

Signed-off-by: default avatarNuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20200915120258.161587-5-nuno.sa@analog.com


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

drivers/iio/gyro/adis16260.c

+11 −22
Original line number Diff line number Diff line
@@ -359,6 +359,11 @@ static const struct adis_data adis16260_data = { 
		BIT(ADIS16260_DIAG_STAT_POWER_LOW_BIT),

};



static void adis16260_stop(void *data)

{

	adis16260_stop_device(data);

}



static int adis16260_probe(struct spi_device *spi)

{

	const struct spi_device_id *id;
@@ -390,35 +395,20 @@ static int adis16260_probe(struct spi_device *spi) 
	if (ret)

		return ret;



	ret = adis_setup_buffer_and_trigger(&adis16260->adis, indio_dev, NULL);

	ret = devm_adis_setup_buffer_and_trigger(&adis16260->adis, indio_dev, NULL);

	if (ret)

		return ret;



	/* Get the device into a sane initial state */

	ret = adis_initial_startup(&adis16260->adis);

	if (ret)

		goto error_cleanup_buffer_trigger;

	ret = iio_device_register(indio_dev);

	if (ret)

		goto error_cleanup_buffer_trigger;



	return 0;



error_cleanup_buffer_trigger:

	adis_cleanup_buffer_and_trigger(&adis16260->adis, indio_dev);

		return ret;

}



static int adis16260_remove(struct spi_device *spi)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct adis16260 *adis16260 = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);

	adis16260_stop_device(indio_dev);

	adis_cleanup_buffer_and_trigger(&adis16260->adis, indio_dev);

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

	if (ret)

		return ret;



	return 0;

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

}



/*
@@ -441,7 +431,6 @@ static struct spi_driver adis16260_driver = { 
		.name = "adis16260",

	},

	.probe = adis16260_probe,

	.remove = adis16260_remove,

	.id_table = adis16260_id,

};

module_spi_driver(adis16260_driver);