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 Poeschel <poeschel@lemonage.de>
Subject: [PATCH 11/11] iio: adc: viperboard_adc: Use devm_iio_device_alloc
Date: Tue, 23 Jul 2013 14:28:17 +0530	[thread overview]
Message-ID: <1374569897-3858-12-git-send-email-sachin.kamat@linaro.org> (raw)
In-Reply-To: <1374569897-3858-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 Poeschel <poeschel@lemonage.de>
---
 drivers/iio/adc/viperboard_adc.c |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/iio/adc/viperboard_adc.c b/drivers/iio/adc/viperboard_adc.c
index 56ac481..09727a7 100644
--- a/drivers/iio/adc/viperboard_adc.c
+++ b/drivers/iio/adc/viperboard_adc.c
@@ -124,7 +124,7 @@ static int vprbrd_adc_probe(struct platform_device *pdev)
 	int ret;
 
 	/* registering iio */
-	indio_dev = iio_device_alloc(sizeof(*adc));
+	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*adc));
 	if (!indio_dev) {
 		dev_err(&pdev->dev, "failed allocating iio device\n");
 		return -ENOMEM;
@@ -142,16 +142,12 @@ static int vprbrd_adc_probe(struct platform_device *pdev)
 	ret = iio_device_register(indio_dev);
 	if (ret) {
 		dev_err(&pdev->dev, "could not register iio (adc)");
-		goto error;
+		return ret;
 	}
 
 	platform_set_drvdata(pdev, indio_dev);
 
 	return 0;
-
-error:
-	iio_device_free(indio_dev);
-	return ret;
 }
 
 static int vprbrd_adc_remove(struct platform_device *pdev)
@@ -159,7 +155,6 @@ static int vprbrd_adc_remove(struct platform_device *pdev)
 	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
 
 	iio_device_unregister(indio_dev);
-	iio_device_free(indio_dev);
 
 	return 0;
 }
-- 
1.7.9.5

  parent reply	other threads:[~2013-07-23  8:58 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-23  8:58 [PATCH 00/11] iio: adc: Use devm_* APIs Sachin Kamat
2013-07-23  8:58 ` [PATCH 01/11] iio: adc: ad7298: " Sachin Kamat
2013-07-23  8:58 ` [PATCH 02/11] iio: adc: ad7476: " Sachin Kamat
2013-07-23  8:58 ` [PATCH 03/11] iio: adc: ad7791: " Sachin Kamat
2013-07-23  8:58 ` [PATCH 04/11] iio: adc: ad7793: " Sachin Kamat
2013-07-23  8:58 ` [PATCH 05/11] iio: adc: ad7887: " Sachin Kamat
2013-07-23  8:58 ` [PATCH 06/11] iio: adc: ad7923: " Sachin Kamat
2013-07-23  8:58 ` [PATCH 07/11] iio: adc: lp8788_adc: " Sachin Kamat
2013-07-27 11:04   ` Jonathan Cameron
2013-07-23  8:58 ` [PATCH 08/11] iio: adc: mcp320x: " Sachin Kamat
2013-07-27 11:05   ` Jonathan Cameron
2013-07-23  8:58 ` [PATCH 09/11] iio: adc: nau7802: Use devm_iio_device_alloc Sachin Kamat
2013-07-23  9:31   ` Maxime Ripard
2013-07-27 11:08     ` Jonathan Cameron
2013-07-23  8:58 ` [PATCH 10/11] iio: adc: ti-adc081c: Use devm_* APIs Sachin Kamat
2013-07-23 15:33   ` Thierry Reding
2013-07-27 11:09     ` Jonathan Cameron
2013-07-23  8:58 ` Sachin Kamat [this message]
2013-07-27 11:10   ` [PATCH 11/11] iio: adc: viperboard_adc: Use devm_iio_device_alloc Jonathan Cameron
2013-07-23 10:59 ` [PATCH 00/11] iio: adc: Use devm_* APIs Lars-Peter Clausen
2013-07-27 11:04   ` 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=1374569897-3858-12-git-send-email-sachin.kamat@linaro.org \
    --to=sachin.kamat@linaro.org \
    --cc=jic23@cam.ac.uk \
    --cc=jic23@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=poeschel@lemonage.de \
    /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).