Commit f7448349 authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron

staging: iio: adis16201: Use devm_iio_device_alloc

Using devm_iio_device_alloc makes code simpler.
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent fdadbce0
...@@ -182,11 +182,10 @@ static int adis16201_probe(struct spi_device *spi) ...@@ -182,11 +182,10 @@ static int adis16201_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);
...@@ -201,10 +200,10 @@ static int adis16201_probe(struct spi_device *spi) ...@@ -201,10 +200,10 @@ static int adis16201_probe(struct spi_device *spi)
ret = adis_init(st, indio_dev, spi, &adis16201_data); ret = adis_init(st, indio_dev, spi, &adis16201_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);
...@@ -218,9 +217,6 @@ static int adis16201_probe(struct spi_device *spi) ...@@ -218,9 +217,6 @@ static int adis16201_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;
} }
...@@ -231,7 +227,6 @@ static int adis16201_remove(struct spi_device *spi) ...@@ -231,7 +227,6 @@ static int adis16201_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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment