staging: iio: adis16209: 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>
This commit is contained in:
parent
cdfb09a40d
commit
864bf5cd86
|
@ -183,11 +183,9 @@ static int adis16209_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 +199,10 @@ static int adis16209_probe(struct spi_device *spi)
|
||||||
|
|
||||||
ret = adis_init(st, indio_dev, spi, &adis16209_data);
|
ret = adis_init(st, indio_dev, spi, &adis16209_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 +216,6 @@ static int adis16209_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 +226,6 @@ static int adis16209_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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue