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

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


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

drivers/iio/gyro/adis16136.c

+13 −24
Original line number Diff line number Diff line
@@ -523,6 +523,11 @@ static const struct adis16136_chip_info adis16136_chip_info[] = { 
	},

};



static void adis16136_stop(void *data)

{

	adis16136_stop_device(data);

}



static int adis16136_probe(struct spi_device *spi)

{

	const struct spi_device_id *id = spi_get_device_id(spi);
@@ -552,38 +557,23 @@ static int adis16136_probe(struct spi_device *spi) 
	if (ret)

		return ret;



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

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

	if (ret)

		return ret;



	ret = adis16136_initial_setup(indio_dev);

	if (ret)

		goto error_cleanup_buffer;

		return ret;



	ret = iio_device_register(indio_dev);

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

	if (ret)

		goto error_stop_device;



	adis16136_debugfs_init(indio_dev);



	return 0;



error_stop_device:

	adis16136_stop_device(indio_dev);

error_cleanup_buffer:

	adis_cleanup_buffer_and_trigger(&adis16136->adis, indio_dev);

		return ret;

}



static int adis16136_remove(struct spi_device *spi)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct adis16136 *adis16136 = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);

	adis16136_stop_device(indio_dev);

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

	if (ret)

		return ret;



	adis_cleanup_buffer_and_trigger(&adis16136->adis, indio_dev);

	adis16136_debugfs_init(indio_dev);



	return 0;

}
@@ -603,7 +593,6 @@ static struct spi_driver adis16136_driver = { 
	},

	.id_table = adis16136_ids,

	.probe = adis16136_probe,

	.remove = adis16136_remove,

};

module_spi_driver(adis16136_driver);