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

iio: adis16201: 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-2-nuno.sa@analog.com


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

drivers/iio/accel/adis16201.c

+3 −23
Original line number Diff line number Diff line
@@ -281,34 +281,15 @@ static int adis16201_probe(struct spi_device *spi) 
	if (ret)

		return ret;



	ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);

	ret = devm_adis_setup_buffer_and_trigger(st, indio_dev, NULL);

	if (ret)

		return ret;



	ret = adis_initial_startup(st);

	if (ret)

		goto error_cleanup_buffer_trigger;



	ret = iio_device_register(indio_dev);

	if (ret < 0)

		goto error_cleanup_buffer_trigger;



	return 0;



error_cleanup_buffer_trigger:

	adis_cleanup_buffer_and_trigger(st, indio_dev);

		return ret;

}



static int adis16201_remove(struct spi_device *spi)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct adis *st = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);

	adis_cleanup_buffer_and_trigger(st, indio_dev);



	return 0;

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

}



static struct spi_driver adis16201_driver = {
@@ -316,7 +297,6 @@ static struct spi_driver adis16201_driver = { 
		.name = "adis16201",

	},

	.probe = adis16201_probe,

	.remove = adis16201_remove,

};

module_spi_driver(adis16201_driver);