mirror of
https://github.com/torvalds/linux.git
synced 2024-12-03 17:41:22 +00:00
iio: adis16209: 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: Nuno Sá <nuno.sa@analog.com> Link: https://lore.kernel.org/r/20200915120258.161587-3-nuno.sa@analog.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
parent
b79a22ee37
commit
17ff204ca8
@ -291,33 +291,15 @@ static int adis16209_probe(struct spi_device *spi)
|
|||||||
if (ret)
|
if (ret)
|
||||||
return 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)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ret = adis_initial_startup(st);
|
ret = adis_initial_startup(st);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto error_cleanup_buffer_trigger;
|
return ret;
|
||||||
ret = iio_device_register(indio_dev);
|
|
||||||
if (ret)
|
|
||||||
goto error_cleanup_buffer_trigger;
|
|
||||||
|
|
||||||
return 0;
|
return devm_iio_device_register(&spi->dev, indio_dev);
|
||||||
|
|
||||||
error_cleanup_buffer_trigger:
|
|
||||||
adis_cleanup_buffer_and_trigger(st, indio_dev);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int adis16209_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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct spi_driver adis16209_driver = {
|
static struct spi_driver adis16209_driver = {
|
||||||
@ -325,7 +307,6 @@ static struct spi_driver adis16209_driver = {
|
|||||||
.name = "adis16209",
|
.name = "adis16209",
|
||||||
},
|
},
|
||||||
.probe = adis16209_probe,
|
.probe = adis16209_probe,
|
||||||
.remove = adis16209_remove,
|
|
||||||
};
|
};
|
||||||
module_spi_driver(adis16209_driver);
|
module_spi_driver(adis16209_driver);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user