diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-09-05 11:29:00 +0200 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-09-07 23:03:47 +0200 |
| commit | d63519e3cf203d04f73eb7ae8eb466882543796e (patch) | |
| tree | cde40c119e9fb94c288c44d6bdfe651af599e2d8 /drivers | |
| parent | staging: iio: ad9852: Use devm_iio_device_alloc (diff) | |
| download | linux-d63519e3cf203d04f73eb7ae8eb466882543796e.tar.xz linux-d63519e3cf203d04f73eb7ae8eb466882543796e.zip | |
staging: iio: ad9910: 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/iio/frequency/ad9910.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/staging/iio/frequency/ad9910.c b/drivers/staging/iio/frequency/ad9910.c index e48f874c1fc2..a7d528ef620c 100644 --- a/drivers/staging/iio/frequency/ad9910.c +++ b/drivers/staging/iio/frequency/ad9910.c @@ -367,11 +367,9 @@ static int ad9910_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); @@ -383,24 +381,18 @@ static int ad9910_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); ad9910_init(st); return 0; - -error_free_dev: - iio_device_free(idev); -error_ret: - return ret; } static int ad9910_remove(struct spi_device *spi) { iio_device_unregister(spi_get_drvdata(spi)); - iio_device_free(spi_get_drvdata(spi)); return 0; } |