Commit 0189d93f authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron

staging: iio: sca3000: 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 4c247470
...@@ -1135,11 +1135,9 @@ static int sca3000_probe(struct spi_device *spi) ...@@ -1135,11 +1135,9 @@ static int sca3000_probe(struct spi_device *spi)
struct sca3000_state *st; struct sca3000_state *st;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
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);
spi_set_drvdata(spi, indio_dev); spi_set_drvdata(spi, indio_dev);
...@@ -1162,7 +1160,7 @@ static int sca3000_probe(struct spi_device *spi) ...@@ -1162,7 +1160,7 @@ static int sca3000_probe(struct spi_device *spi)
sca3000_configure_ring(indio_dev); sca3000_configure_ring(indio_dev);
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
if (ret < 0) if (ret < 0)
goto error_free_dev; return ret;
ret = iio_buffer_register(indio_dev, ret = iio_buffer_register(indio_dev,
sca3000_channels, sca3000_channels,
...@@ -1198,10 +1196,6 @@ static int sca3000_probe(struct spi_device *spi) ...@@ -1198,10 +1196,6 @@ static int sca3000_probe(struct spi_device *spi)
iio_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
error_unregister_dev: error_unregister_dev:
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
error_free_dev:
iio_device_free(indio_dev);
error_ret:
return ret; return ret;
} }
...@@ -1235,7 +1229,6 @@ static int sca3000_remove(struct spi_device *spi) ...@@ -1235,7 +1229,6 @@ static int sca3000_remove(struct spi_device *spi)
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
iio_buffer_unregister(indio_dev); iio_buffer_unregister(indio_dev);
sca3000_unconfigure_ring(indio_dev); sca3000_unconfigure_ring(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