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,
	Milo Kim <milo.kim@ti.com>
Subject: [PATCH 07/11] iio: adc: lp8788_adc: Use devm_* APIs
Date: Tue, 23 Jul 2013 14:28:13 +0530	[thread overview]
Message-ID: <1374569897-3858-8-git-send-email-sachin.kamat@linaro.org> (raw)
In-Reply-To: <1374569897-3858-1-git-send-email-sachin.kamat@linaro.org>

devm_* APIs are device managed and make code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Milo Kim <milo.kim@ti.com>
---
 drivers/iio/adc/lp8788_adc.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/iio/adc/lp8788_adc.c b/drivers/iio/adc/lp8788_adc.c
index 62bc39e..5c8c915 100644
--- a/drivers/iio/adc/lp8788_adc.c
+++ b/drivers/iio/adc/lp8788_adc.c
@@ -194,7 +194,7 @@ static int lp8788_adc_probe(struct platform_device *pdev)
 	struct lp8788_adc *adc;
 	int ret;
 
-	indio_dev = iio_device_alloc(sizeof(*adc));
+	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*adc));
 	if (!indio_dev)
 		return -ENOMEM;
 
@@ -205,7 +205,7 @@ static int lp8788_adc_probe(struct platform_device *pdev)
 	indio_dev->dev.of_node = pdev->dev.of_node;
 	ret = lp8788_iio_map_register(indio_dev, lp->pdata, adc);
 	if (ret)
-		goto err_iio_map;
+		return ret;
 
 	mutex_init(&adc->lock);
 
@@ -226,8 +226,6 @@ static int lp8788_adc_probe(struct platform_device *pdev)
 
 err_iio_device:
 	iio_map_array_unregister(indio_dev);
-err_iio_map:
-	iio_device_free(indio_dev);
 	return ret;
 }
 
@@ -237,7 +235,6 @@ static int lp8788_adc_remove(struct platform_device *pdev)
 
 	iio_device_unregister(indio_dev);
 	iio_map_array_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 ` Sachin Kamat [this message]
2013-07-27 11:04   ` [PATCH 07/11] iio: adc: lp8788_adc: " 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 ` [PATCH 11/11] iio: adc: viperboard_adc: Use devm_iio_device_alloc Sachin Kamat
2013-07-27 11:10   ` 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-8-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=milo.kim@ti.com \
    /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).