From: Sachin Kamat <sachin.kamat@linaro.org>
To: linux-iio@vger.kernel.org
Cc: jic23@kernel.org, jic23@cam.ac.uk, sachin.kamat@linaro.org,
	Christian Strobel <christian.strobel@iis.fraunhofer.de>
Subject: [PATCH 7/9] iio: gyro: itg3200_core: Use devm_iio_device_alloc
Date: Tue, 13 Aug 2013 12:04:33 +0530	[thread overview]
Message-ID: <1376375675-11595-7-git-send-email-sachin.kamat@linaro.org> (raw)
In-Reply-To: <1376375675-11595-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: Christian Strobel <christian.strobel@iis.fraunhofer.de>
---
 drivers/iio/gyro/itg3200_core.c |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/iio/gyro/itg3200_core.c b/drivers/iio/gyro/itg3200_core.c
index d66605d2..4d3f3b9 100644
--- a/drivers/iio/gyro/itg3200_core.c
+++ b/drivers/iio/gyro/itg3200_core.c
@@ -309,11 +309,9 @@ static int itg3200_probe(struct i2c_client *client,
 
 	dev_dbg(&client->dev, "probe I2C dev with IRQ %i", client->irq);
 
-	indio_dev = iio_device_alloc(sizeof(*st));
-	if (indio_dev == NULL) {
-		ret =  -ENOMEM;
-		goto error_ret;
-	}
+	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*st));
+	if (!indio_dev)
+		return -ENOMEM;
 
 	st = iio_priv(indio_dev);
 
@@ -330,7 +328,7 @@ static int itg3200_probe(struct i2c_client *client,
 
 	ret = itg3200_buffer_configure(indio_dev);
 	if (ret)
-		goto error_free_dev;
+		return ret;
 
 	if (client->irq) {
 		ret = itg3200_probe_trigger(indio_dev);
@@ -353,9 +351,6 @@ error_remove_trigger:
 		itg3200_remove_trigger(indio_dev);
 error_unconfigure_buffer:
 	itg3200_buffer_unconfigure(indio_dev);
-error_free_dev:
-	iio_device_free(indio_dev);
-error_ret:
 	return ret;
 }
 
@@ -370,8 +365,6 @@ static int itg3200_remove(struct i2c_client *client)
 
 	itg3200_buffer_unconfigure(indio_dev);
 
-	iio_device_free(indio_dev);
-
 	return 0;
 }
 
-- 
1.7.9.5
next prev parent reply	other threads:[~2013-08-13  6:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-13  6:34 [PATCH 1/9] iio: gyro: adis16080: Use devm_iio_device_alloc Sachin Kamat
2013-08-13  6:34 ` [PATCH 2/9] iio: gyro: adis16130: " Sachin Kamat
2013-08-13 18:35   ` Jonathan Cameron
2013-08-13  6:34 ` [PATCH 3/9] iio: gyro: adis16136: " Sachin Kamat
2013-08-13 18:35   ` Jonathan Cameron
2013-08-13  6:34 ` [PATCH 4/9] iio: gyro: adis16260: " Sachin Kamat
2013-08-13 18:37   ` Jonathan Cameron
2013-08-13  6:34 ` [PATCH 5/9] iio: gyro: adxrs450: " Sachin Kamat
2013-08-13 18:38   ` Jonathan Cameron
2013-08-13  6:34 ` [PATCH 6/9] iio: hid-sensor-gyro-3d: " Sachin Kamat
2013-08-13 18:39   ` Jonathan Cameron
2013-08-13  6:34 ` Sachin Kamat [this message]
2013-08-13 18:40   ` [PATCH 7/9] iio: gyro: itg3200_core: " Jonathan Cameron
2013-08-13  6:34 ` [PATCH 8/9] iio: gyro: st_gyro: " Sachin Kamat
2013-08-13 18:41   ` Jonathan Cameron
2013-08-13  6:34 ` [PATCH 9/9] iio: gyro: adis16060_core: " Sachin Kamat
2013-08-13 18:42   ` Jonathan Cameron
2013-08-13  9:03 ` [PATCH 1/9] iio: gyro: adis16080: " Lars-Peter Clausen
2013-08-13 18:32 ` 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=1376375675-11595-7-git-send-email-sachin.kamat@linaro.org \
    --to=sachin.kamat@linaro.org \
    --cc=christian.strobel@iis.fraunhofer.de \
    --cc=jic23@cam.ac.uk \
    --cc=jic23@kernel.org \
    --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).