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,
Michael Hennerich <hennerich@blackfin.uclinux.org>
Subject: [PATCH 06/11] iio: adc: ad7923: Use devm_* APIs
Date: Tue, 23 Jul 2013 14:28:12 +0530 [thread overview]
Message-ID: <1374569897-3858-7-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: Michael Hennerich <hennerich@blackfin.uclinux.org>
---
drivers/iio/adc/ad7923.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/drivers/iio/adc/ad7923.c b/drivers/iio/adc/ad7923.c
index 97fa0d3..4108dbb 100644
--- a/drivers/iio/adc/ad7923.c
+++ b/drivers/iio/adc/ad7923.c
@@ -275,10 +275,11 @@ static const struct iio_info ad7923_info = {
static int ad7923_probe(struct spi_device *spi)
{
struct ad7923_state *st;
- struct iio_dev *indio_dev = iio_device_alloc(sizeof(*st));
+ struct iio_dev *indio_dev;
const struct ad7923_chip_info *info;
int ret;
+ indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (indio_dev == NULL)
return -ENOMEM;
@@ -311,14 +312,13 @@ static int ad7923_probe(struct spi_device *spi)
spi_message_add_tail(&st->scan_single_xfer[0], &st->scan_single_msg);
spi_message_add_tail(&st->scan_single_xfer[1], &st->scan_single_msg);
- st->reg = regulator_get(&spi->dev, "refin");
- if (IS_ERR(st->reg)) {
- ret = PTR_ERR(st->reg);
- goto error_free;
- }
+ st->reg = devm_regulator_get(&spi->dev, "refin");
+ if (IS_ERR(st->reg))
+ return PTR_ERR(st->reg);
+
ret = regulator_enable(st->reg);
if (ret)
- goto error_put_reg;
+ return ret;
ret = iio_triggered_buffer_setup(indio_dev, NULL,
&ad7923_trigger_handler, NULL);
@@ -335,10 +335,6 @@ error_cleanup_ring:
iio_triggered_buffer_cleanup(indio_dev);
error_disable_reg:
regulator_disable(st->reg);
-error_put_reg:
- regulator_put(st->reg);
-error_free:
- iio_device_free(indio_dev);
return ret;
}
@@ -351,8 +347,6 @@ static int ad7923_remove(struct spi_device *spi)
iio_device_unregister(indio_dev);
iio_triggered_buffer_cleanup(indio_dev);
regulator_disable(st->reg);
- regulator_put(st->reg);
- iio_device_free(indio_dev);
return 0;
}
--
1.7.9.5
next prev 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 ` Sachin Kamat [this message]
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 ` [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-7-git-send-email-sachin.kamat@linaro.org \
--to=sachin.kamat@linaro.org \
--cc=hennerich@blackfin.uclinux.org \
--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).