Commit 6694cf96 authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron

iio: gyro: adxrs450: 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 1ba15cf2
...@@ -426,11 +426,9 @@ static int adxrs450_probe(struct spi_device *spi) ...@@ -426,11 +426,9 @@ static int adxrs450_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);
st->us = spi; st->us = spi;
mutex_init(&st->buf_lock); mutex_init(&st->buf_lock);
...@@ -447,7 +445,7 @@ static int adxrs450_probe(struct spi_device *spi) ...@@ -447,7 +445,7 @@ static int adxrs450_probe(struct spi_device *spi)
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
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 = adxrs450_initial_setup(indio_dev); ret = adxrs450_initial_setup(indio_dev);
...@@ -456,17 +454,12 @@ static int adxrs450_probe(struct spi_device *spi) ...@@ -456,17 +454,12 @@ static int adxrs450_probe(struct spi_device *spi)
return 0; return 0;
error_initial: error_initial:
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
error_free_dev:
iio_device_free(indio_dev);
error_ret:
return ret; return ret;
} }
static int adxrs450_remove(struct spi_device *spi) static int adxrs450_remove(struct spi_device *spi)
{ {
iio_device_unregister(spi_get_drvdata(spi)); iio_device_unregister(spi_get_drvdata(spi));
iio_device_free(spi_get_drvdata(spi));
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