diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-08-24 19:48:00 +0100 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2013-08-28 20:20:25 +0100 |
| commit | e8cac7f61452d45cd4bca8cb11c139edc9633f38 (patch) | |
| tree | 88720f9d5592758c957ead95d5c5ddccf9d246ec /drivers/staging/iio | |
| parent | 1868171c5caef74996c3604146e60b976e249344 (diff) | |
| download | linux-stable-e8cac7f61452d45cd4bca8cb11c139edc9633f38.tar.gz linux-stable-e8cac7f61452d45cd4bca8cb11c139edc9633f38.tar.bz2 linux-stable-e8cac7f61452d45cd4bca8cb11c139edc9633f38.zip | |
staging: iio: adis16240: Use devm_iio_device_alloc
Using 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/staging/iio')
| -rw-r--r-- | drivers/staging/iio/accel/adis16240_core.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/staging/iio/accel/adis16240_core.c b/drivers/staging/iio/accel/adis16240_core.c index fd1f0fd0fba8..3a303a03d028 100644 --- a/drivers/staging/iio/accel/adis16240_core.c +++ b/drivers/staging/iio/accel/adis16240_core.c @@ -236,11 +236,9 @@ static int adis16240_probe(struct spi_device *spi) struct iio_dev *indio_dev; /* setup the industrialio driver allocated elements */ - indio_dev = iio_device_alloc(sizeof(*st)); - if (indio_dev == NULL) { - ret = -ENOMEM; - goto error_ret; - } + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st)); + if (!indio_dev) + return -ENOMEM; st = iio_priv(indio_dev); /* this is only used for removal purposes */ spi_set_drvdata(spi, indio_dev); @@ -254,10 +252,10 @@ static int adis16240_probe(struct spi_device *spi) ret = adis_init(st, indio_dev, spi, &adis16240_data); if (ret) - goto error_free_dev; + return ret; ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL); if (ret) - goto error_free_dev; + return ret; /* Get the device into a sane initial state */ ret = adis_initial_startup(st); @@ -270,9 +268,6 @@ static int adis16240_probe(struct spi_device *spi) error_cleanup_buffer_trigger: adis_cleanup_buffer_and_trigger(st, indio_dev); -error_free_dev: - iio_device_free(indio_dev); -error_ret: return ret; } @@ -283,7 +278,6 @@ static int adis16240_remove(struct spi_device *spi) iio_device_unregister(indio_dev); adis_cleanup_buffer_and_trigger(st, indio_dev); - iio_device_free(indio_dev); return 0; } |