redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: iio: adis16240: Use devm_iio_device_alloc 

Using devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
hifive-unleashed-5.1
Sachin Kamat 2013-08-24 19:48:00 +01:00 committed by Jonathan Cameron
parent 1868171c5c
commit e8cac7f614
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/iio/accel/adis16240_core.c
View File

@ -236,11 +236,9 @@ static int adis16240_probe(struct spi_device *spi)
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
/* setup the industrialio driver allocated elements */ /* setup the industrialio driver allocated elements */
indio_dev = iio_device_alloc(sizeof(*st)); indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (indio_dev == NULL) { if (!indio_dev)
ret = -ENOMEM; return -ENOMEM;
goto error_ret;
}
st = iio_priv(indio_dev); st = iio_priv(indio_dev);
/* this is only used for removal purposes */ /* this is only used for removal purposes */
spi_set_drvdata(spi, indio_dev); spi_set_drvdata(spi, indio_dev);
@ -254,10 +252,10 @@ static int adis16240_probe(struct spi_device *spi)
ret = adis_init(st, indio_dev, spi, &adis16240_data); ret = adis_init(st, indio_dev, spi, &adis16240_data);
if (ret) if (ret)
goto error_free_dev; return ret;
ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL); ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
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 = adis_initial_startup(st); ret = adis_initial_startup(st);
@ -270,9 +268,6 @@ static int adis16240_probe(struct spi_device *spi)
error_cleanup_buffer_trigger: error_cleanup_buffer_trigger:
adis_cleanup_buffer_and_trigger(st, indio_dev); adis_cleanup_buffer_and_trigger(st, indio_dev);
error_free_dev:
iio_device_free(indio_dev);
error_ret:
return ret; return ret;
} }
@ -283,7 +278,6 @@ static int adis16240_remove(struct spi_device *spi)
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
adis_cleanup_buffer_and_trigger(st, indio_dev); adis_cleanup_buffer_and_trigger(st, indio_dev);
iio_device_free(indio_dev);
return 0; return 0;
} }