From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sachin Kamat To: linux-iio@vger.kernel.org Cc: jic23@kernel.org, sachin.kamat@linaro.org, Barry Song <21cnbao@gmail.com> Subject: [PATCH 07/10] staging: iio: ade7754: Use devm_iio_device_alloc Date: Wed, 11 Sep 2013 15:25:22 +0530 Message-Id: <1378893325-31764-7-git-send-email-sachin.kamat@linaro.org> In-Reply-To: <1378893325-31764-1-git-send-email-sachin.kamat@linaro.org> References: <1378893325-31764-1-git-send-email-sachin.kamat@linaro.org> List-ID: devm_iio_device_alloc makes code simpler. Signed-off-by: Sachin Kamat Cc: Barry Song <21cnbao@gmail.com> --- drivers/staging/iio/meter/ade7754.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c index 63a6ad1c..2e046f6 100644 --- a/drivers/staging/iio/meter/ade7754.c +++ b/drivers/staging/iio/meter/ade7754.c @@ -520,11 +520,9 @@ static int ade7754_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; /* this is only used for removal purposes */ spi_set_drvdata(spi, indio_dev); @@ -540,18 +538,12 @@ static int ade7754_probe(struct spi_device *spi) /* Get the device into a sane initial state */ ret = ade7754_initial_setup(indio_dev); if (ret) - goto error_free_dev; + return ret; ret = iio_device_register(indio_dev); if (ret) - goto error_free_dev; + return ret; return 0; - -error_free_dev: - iio_device_free(indio_dev); - -error_ret: - return ret; } /* fixme, confirm ordering in this function */ @@ -561,7 +553,6 @@ static int ade7754_remove(struct spi_device *spi) iio_device_unregister(indio_dev); ade7754_stop_device(&indio_dev->dev); - iio_device_free(indio_dev); return 0; } -- 1.7.9.5