From: Sachin Kamat Date: Sat, 24 Aug 2013 18:48:00 +0000 (+0100) Subject: staging: iio: adis16209: Use devm_iio_device_alloc X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=864bf5cd86b3a91a6608929e5661947060ca160d;p=openwrt%2Fstaging%2Fblogic.git staging: iio: adis16209: Use devm_iio_device_alloc Using devm_iio_device_alloc makes code simpler. Signed-off-by: Sachin Kamat Signed-off-by: Jonathan Cameron --- diff --git a/drivers/staging/iio/accel/adis16209_core.c b/drivers/staging/iio/accel/adis16209_core.c index 323c169d699c..4492e51d8886 100644 --- a/drivers/staging/iio/accel/adis16209_core.c +++ b/drivers/staging/iio/accel/adis16209_core.c @@ -183,11 +183,9 @@ static int adis16209_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); @@ -201,10 +199,10 @@ static int adis16209_probe(struct spi_device *spi) ret = adis_init(st, indio_dev, spi, &adis16209_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); @@ -218,9 +216,6 @@ static int adis16209_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; } @@ -231,7 +226,6 @@ static int adis16209_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; }