aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-08-24 14:48:00 -0400
committerJonathan Cameron <jic23@kernel.org>2013-08-28 15:20:23 -0400
commit69fad8aa4dc81e04427faf2a9a43a615fb618cb2 (patch)
treeb0e8d46ddd09fb60336d98e71fd4a1a9ff324344
parentf7448349609b8defa856f0920f56f3e3c8bf0dd5 (diff)
staging: iio: adis16203: 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>
-rw-r--r--drivers/staging/iio/accel/adis16203_core.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/staging/iio/accel/adis16203_core.c b/drivers/staging/iio/accel/adis16203_core.c
index b08ac8fdeee2..409a28ed9043 100644
--- a/drivers/staging/iio/accel/adis16203_core.c
+++ b/drivers/staging/iio/accel/adis16203_core.c
@@ -148,11 +148,9 @@ static int adis16203_probe(struct spi_device *spi)
148 struct adis *st; 148 struct adis *st;
149 149
150 /* setup the industrialio driver allocated elements */ 150 /* setup the industrialio driver allocated elements */
151 indio_dev = iio_device_alloc(sizeof(*st)); 151 indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
152 if (indio_dev == NULL) { 152 if (!indio_dev)
153 ret = -ENOMEM; 153 return -ENOMEM;
154 goto error_ret;
155 }
156 st = iio_priv(indio_dev); 154 st = iio_priv(indio_dev);
157 /* this is only used for removal purposes */ 155 /* this is only used for removal purposes */
158 spi_set_drvdata(spi, indio_dev); 156 spi_set_drvdata(spi, indio_dev);
@@ -166,11 +164,11 @@ static int adis16203_probe(struct spi_device *spi)
166 164
167 ret = adis_init(st, indio_dev, spi, &adis16203_data); 165 ret = adis_init(st, indio_dev, spi, &adis16203_data);
168 if (ret) 166 if (ret)
169 goto error_free_dev; 167 return ret;
170 168
171 ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL); 169 ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);
172 if (ret) 170 if (ret)
173 goto error_free_dev; 171 return ret;
174 172
175 /* Get the device into a sane initial state */ 173 /* Get the device into a sane initial state */
176 ret = adis_initial_startup(st); 174 ret = adis_initial_startup(st);
@@ -185,9 +183,6 @@ static int adis16203_probe(struct spi_device *spi)
185 183
186error_cleanup_buffer_trigger: 184error_cleanup_buffer_trigger:
187 adis_cleanup_buffer_and_trigger(st, indio_dev); 185 adis_cleanup_buffer_and_trigger(st, indio_dev);
188error_free_dev:
189 iio_device_free(indio_dev);
190error_ret:
191 return ret; 186 return ret;
192} 187}
193 188
@@ -198,7 +193,6 @@ static int adis16203_remove(struct spi_device *spi)
198 193
199 iio_device_unregister(indio_dev); 194 iio_device_unregister(indio_dev);
200 adis_cleanup_buffer_and_trigger(st, indio_dev); 195 adis_cleanup_buffer_and_trigger(st, indio_dev);
201 iio_device_free(indio_dev);
202 196
203 return 0; 197 return 0;
204} 198}