openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio: imu: adis16400: Use devm_iio_device_alloc 

Using devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Sachin Kamat 2013-07-30 09:44:00 +01:00 committed by Jonathan Cameron
parent 7fc5ad7e97
commit 5b778b97d4
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/iio/imu/adis16400_core.c
View File

@ -871,7 +871,7 @@ static int adis16400_probe(struct spi_device *spi)
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
int ret; int ret;
indio_dev = iio_device_alloc(sizeof(*st)); indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (indio_dev == NULL) if (indio_dev == NULL)
return -ENOMEM; return -ENOMEM;
@ -893,12 +893,12 @@ static int adis16400_probe(struct spi_device *spi)
ret = adis_init(&st->adis, indio_dev, spi, &adis16400_data); ret = adis_init(&st->adis, indio_dev, spi, &adis16400_data);
if (ret) if (ret)
goto error_free_dev; return ret;
ret = adis_setup_buffer_and_trigger(&st->adis, indio_dev, ret = adis_setup_buffer_and_trigger(&st->adis, indio_dev,
adis16400_trigger_handler); adis16400_trigger_handler);
if (ret) if (ret)
goto error_free_dev; return ret;
/* Get the device into a sane initial state */ /* Get the device into a sane initial state */
ret = adis16400_initial_setup(indio_dev); ret = adis16400_initial_setup(indio_dev);
@ -913,8 +913,6 @@ static int adis16400_probe(struct spi_device *spi)
error_cleanup_buffer: error_cleanup_buffer:
adis_cleanup_buffer_and_trigger(&st->adis, indio_dev); adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
error_free_dev:
iio_device_free(indio_dev);
return ret; return ret;
} }
@ -928,8 +926,6 @@ static int adis16400_remove(struct spi_device *spi)
adis_cleanup_buffer_and_trigger(&st->adis, indio_dev); adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
iio_device_free(indio_dev);
return 0; return 0;
} }