From: Sachin Kamat <sachin.kamat@linaro.org>
To: linux-iio@vger.kernel.org
Cc: jic23@kernel.org, lars@metafoo.de, sachin.kamat@linaro.org
Subject: [PATCH 2/9] staging: iio: ad7280a: Use devm_iio_device_alloc
Date: Sat, 31 Aug 2013 22:42:32 +0530 [thread overview]
Message-ID: <1377969159-2491-2-git-send-email-sachin.kamat@linaro.org> (raw)
In-Reply-To: <1377969159-2491-1-git-send-email-sachin.kamat@linaro.org>
devm_iio_device_alloc makes code simpler.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
drivers/staging/iio/adc/ad7280a.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index c19618b..e7191e4 100644
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -835,8 +835,9 @@ static int ad7280_probe(struct spi_device *spi)
int ret;
const unsigned short tACQ_ns[4] = {465, 1010, 1460, 1890};
const unsigned short nAVG[4] = {1, 2, 4, 8};
- struct iio_dev *indio_dev = iio_device_alloc(sizeof(*st));
+ struct iio_dev *indio_dev;
+ indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (indio_dev == NULL)
return -ENOMEM;
@@ -860,7 +861,7 @@ static int ad7280_probe(struct spi_device *spi)
ret = ad7280_chain_setup(st);
if (ret < 0)
- goto error_free_device;
+ return ret;
st->slave_num = ret;
st->scan_cnt = (st->slave_num + 1) * AD7280A_NUM_CH;
@@ -891,7 +892,7 @@ static int ad7280_probe(struct spi_device *spi)
ret = ad7280_channel_init(st);
if (ret < 0)
- goto error_free_device;
+ return ret;
indio_dev->num_channels = ret;
indio_dev->channels = st->channels;
@@ -940,9 +941,6 @@ error_free_attr:
error_free_channels:
kfree(st->channels);
-error_free_device:
- iio_device_free(indio_dev);
-
return ret;
}
@@ -960,7 +958,6 @@ static int ad7280_remove(struct spi_device *spi)
kfree(st->channels);
kfree(st->iio_attr);
- iio_device_free(indio_dev);
return 0;
}
--
1.7.4.1
next prev parent reply other threads:[~2013-08-31 17:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-31 17:12 [PATCH 1/9] staging: iio: ad7192: Use devm_* APIs Sachin Kamat
2013-08-31 17:12 ` Sachin Kamat [this message]
2013-08-31 17:12 ` [PATCH 3/9] staging: iio: ad7291: " Sachin Kamat
2013-08-31 17:12 ` [PATCH 4/9] staging: iio: ad7606_core: " Sachin Kamat
2013-08-31 17:12 ` [PATCH 5/9] staging: iio: ad7780: " Sachin Kamat
2013-08-31 17:12 ` [PATCH 6/9] staging: iio: ad7816: " Sachin Kamat
2013-08-31 17:12 ` [PATCH 7/9] staging: iio: ad799x_core: " Sachin Kamat
2013-08-31 17:12 ` [PATCH 8/9] staging: iio: lpc32xx_adc: " Sachin Kamat
2013-08-31 17:12 ` [PATCH 9/9] staging: iio: adt7316: " Sachin Kamat
2013-08-31 18:31 ` [PATCH 1/9] staging: iio: ad7192: " Jonathan Cameron
2013-09-01 5:51 ` Sachin Kamat
2013-09-07 20:51 ` 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=1377969159-2491-2-git-send-email-sachin.kamat@linaro.org \
--to=sachin.kamat@linaro.org \
--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).