Commit 827b14a8 authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron

iio: gyro: adis16260: Use devm_iio_device_alloc

Using devm_iio_device_alloc makes code simpler.
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent c0ca6d31
...@@ -343,11 +343,9 @@ static int adis16260_probe(struct spi_device *spi) ...@@ -343,11 +343,9 @@ static int adis16260_probe(struct spi_device *spi)
int ret; int ret;
/* setup the industrialio driver allocated elements */ /* setup the industrialio driver allocated elements */
indio_dev = iio_device_alloc(sizeof(*adis)); indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*adis));
if (indio_dev == NULL) { if (!indio_dev)
ret = -ENOMEM; return -ENOMEM;
goto error_ret;
}
adis = iio_priv(indio_dev); adis = 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);
...@@ -361,11 +359,11 @@ static int adis16260_probe(struct spi_device *spi) ...@@ -361,11 +359,11 @@ static int adis16260_probe(struct spi_device *spi)
ret = adis_init(adis, indio_dev, spi, &adis16260_data); ret = adis_init(adis, indio_dev, spi, &adis16260_data);
if (ret) if (ret)
goto error_free_dev; return ret;
ret = adis_setup_buffer_and_trigger(adis, indio_dev, NULL); ret = adis_setup_buffer_and_trigger(adis, 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(adis); ret = adis_initial_startup(adis);
...@@ -379,9 +377,6 @@ static int adis16260_probe(struct spi_device *spi) ...@@ -379,9 +377,6 @@ static int adis16260_probe(struct spi_device *spi)
error_cleanup_buffer_trigger: error_cleanup_buffer_trigger:
adis_cleanup_buffer_and_trigger(adis, indio_dev); adis_cleanup_buffer_and_trigger(adis, indio_dev);
error_free_dev:
iio_device_free(indio_dev);
error_ret:
return ret; return ret;
} }
...@@ -393,7 +388,6 @@ static int adis16260_remove(struct spi_device *spi) ...@@ -393,7 +388,6 @@ static int adis16260_remove(struct spi_device *spi)
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
adis16260_stop_device(indio_dev); adis16260_stop_device(indio_dev);
adis_cleanup_buffer_and_trigger(adis, indio_dev); adis_cleanup_buffer_and_trigger(adis, 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