linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sachin Kamat <sachin.kamat@linaro.org>
To: linux-iio@vger.kernel.org
Cc: jic23@cam.ac.uk, jic23@kernel.org, sachin.kamat@linaro.org,
	Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 2/6] iio: imu: adis16480: Use devm_iio_device_alloc
Date: Tue, 30 Jul 2013 14:14:24 +0530	[thread overview]
Message-ID: <1375173868-13235-2-git-send-email-sachin.kamat@linaro.org> (raw)
In-Reply-To: <1375173868-13235-1-git-send-email-sachin.kamat@linaro.org>

Using devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/iio/imu/adis16480.c |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/iio/imu/adis16480.c b/drivers/iio/imu/adis16480.c
index b7db383..dd4206c 100644
--- a/drivers/iio/imu/adis16480.c
+++ b/drivers/iio/imu/adis16480.c
@@ -839,7 +839,7 @@ static int adis16480_probe(struct spi_device *spi)
 	struct adis16480 *st;
 	int ret;
 
-	indio_dev = iio_device_alloc(sizeof(*st));
+	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
 	if (indio_dev == NULL)
 		return -ENOMEM;
 
@@ -857,11 +857,11 @@ static int adis16480_probe(struct spi_device *spi)
 
 	ret = adis_init(&st->adis, indio_dev, spi, &adis16480_data);
 	if (ret)
-		goto error_free_dev;
+		return ret;
 
 	ret = adis_setup_buffer_and_trigger(&st->adis, indio_dev, NULL);
 	if (ret)
-		goto error_free_dev;
+		return ret;
 
 	ret = adis16480_initial_setup(indio_dev);
 	if (ret)
@@ -879,8 +879,6 @@ error_stop_device:
 	adis16480_stop_device(indio_dev);
 error_cleanup_buffer:
 	adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
-error_free_dev:
-	iio_device_free(indio_dev);
 	return ret;
 }
 
@@ -894,8 +892,6 @@ static int adis16480_remove(struct spi_device *spi)
 
 	adis_cleanup_buffer_and_trigger(&st->adis, indio_dev);
 
-	iio_device_free(indio_dev);
-
 	return 0;
 }
 
-- 
1.7.9.5

  reply	other threads:[~2013-07-30  8:44 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-30  8:44 [PATCH 1/6] iio: imu: adis16400: Use devm_iio_device_alloc Sachin Kamat
2013-07-30  8:44 ` Sachin Kamat [this message]
2013-08-03 17:49   ` [PATCH 2/6] iio: imu: adis16480: " Jonathan Cameron
2013-07-30  8:44 ` [PATCH 3/6] iio: imu: inv_mpu6050: " Sachin Kamat
2013-08-03 17:50   ` Jonathan Cameron
2013-07-30  8:44 ` [PATCH 4/6] iio: light: hid-sensor-als: " Sachin Kamat
2013-08-02 16:08   ` Srinivas Pandruvada
2013-08-03 17:54     ` Jonathan Cameron
2013-07-30  8:44 ` [PATCH 5/6] iio: light: lm3533-als: " Sachin Kamat
2013-08-03 17:54   ` Jonathan Cameron
2013-07-30  8:44 ` [PATCH 6/6] iio: light: tsl2563: Use devm_* APIs Sachin Kamat
2013-07-30  9:07   ` Amit Kucheria
2013-08-03 17:57     ` Jonathan Cameron
2013-08-03 17:49 ` [PATCH 1/6] iio: imu: adis16400: Use devm_iio_device_alloc Jonathan Cameron

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1375173868-13235-2-git-send-email-sachin.kamat@linaro.org \
    --to=sachin.kamat@linaro.org \
    --cc=jic23@cam.ac.uk \
    --cc=jic23@kernel.org \
    --cc=lars@metafoo.de \
    --cc=linux-iio@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).