diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-09-05 09:29:00 (GMT) |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-09-07 21:04:49 (GMT) |
| commit | 177e4af04e5e11aee18e794359997cc301fa9f0f (patch) | |
| tree | 08f5b70da6c31a23c2c8055c7715290eeb63fec6 | |
| parent | d63519e3cf203d04f73eb7ae8eb466882543796e (diff) | |
| download | linux-fsl-qoriq-177e4af04e5e11aee18e794359997cc301fa9f0f.tar.xz | |
staging: iio: ad9951: Use devm_iio_device_alloc
devm_iio_device_alloc makes code simpler.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/staging/iio/frequency/ad9951.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/staging/iio/frequency/ad9951.c b/drivers/staging/iio/frequency/ad9951.c index 8234e3c..0094c2f 100644 --- a/drivers/staging/iio/frequency/ad9951.c +++ b/drivers/staging/iio/frequency/ad9951.c @@ -176,11 +176,9 @@ static int ad9951_probe(struct spi_device *spi) struct iio_dev *idev; int ret = 0; - idev = iio_device_alloc(sizeof(*st)); - if (idev == NULL) { - ret = -ENOMEM; - goto error_ret; - } + idev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); + if (!idev) + return -ENOMEM; spi_set_drvdata(spi, idev); st = iio_priv(idev); mutex_init(&st->lock); @@ -193,25 +191,18 @@ static int ad9951_probe(struct spi_device *spi) ret = iio_device_register(idev); if (ret) - goto error_free_dev; + return ret; spi->max_speed_hz = 2000000; spi->mode = SPI_MODE_3; spi->bits_per_word = 8; spi_setup(spi); ad9951_init(st); return 0; - -error_free_dev: - iio_device_free(idev); - -error_ret: - return ret; } static int ad9951_remove(struct spi_device *spi) { iio_device_unregister(spi_get_drvdata(spi)); - iio_device_free(spi_get_drvdata(spi)); return 0; } |