Commit 98d8abd6 authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron

staging: iio: ad9852: Use devm_iio_device_alloc

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 f8e405d9
...@@ -229,11 +229,9 @@ static int ad9852_probe(struct spi_device *spi) ...@@ -229,11 +229,9 @@ static int ad9852_probe(struct spi_device *spi)
struct iio_dev *idev; struct iio_dev *idev;
int ret = 0; int ret = 0;
idev = iio_device_alloc(sizeof(*st)); idev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (idev == NULL) { if (!idev)
ret = -ENOMEM; return -ENOMEM;
goto error_ret;
}
st = iio_priv(idev); st = iio_priv(idev);
spi_set_drvdata(spi, idev); spi_set_drvdata(spi, idev);
mutex_init(&st->lock); mutex_init(&st->lock);
...@@ -245,7 +243,7 @@ static int ad9852_probe(struct spi_device *spi) ...@@ -245,7 +243,7 @@ static int ad9852_probe(struct spi_device *spi)
ret = iio_device_register(idev); ret = iio_device_register(idev);
if (ret) if (ret)
goto error_free_dev; return ret;
spi->max_speed_hz = 2000000; spi->max_speed_hz = 2000000;
spi->mode = SPI_MODE_3; spi->mode = SPI_MODE_3;
spi->bits_per_word = 8; spi->bits_per_word = 8;
...@@ -253,18 +251,11 @@ static int ad9852_probe(struct spi_device *spi) ...@@ -253,18 +251,11 @@ static int ad9852_probe(struct spi_device *spi)
ad9852_init(st); ad9852_init(st);
return 0; return 0;
error_free_dev:
iio_device_free(idev);
error_ret:
return ret;
} }
static int ad9852_remove(struct spi_device *spi) static int ad9852_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