From: Sachin Kamat <sachin.kamat@linaro.org>
To: linux-iio@vger.kernel.org
Cc: jic23@kernel.org, sachin.kamat@linaro.org,
Shubhrajyoti Datta <shubhrajyoti@ti.com>
Subject: [PATCH 01/10] staging: iio: hmc5843: Use devm_iio_device_alloc
Date: Wed, 11 Sep 2013 15:25:16 +0530 [thread overview]
Message-ID: <1378893325-31764-1-git-send-email-sachin.kamat@linaro.org> (raw)
devm_iio_device_alloc makes code simpler.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Shubhrajyoti Datta <shubhrajyoti@ti.com>
---
Series compile tested.
---
drivers/staging/iio/magnetometer/hmc5843.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
index 67c1ce7..790f456 100644
--- a/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/drivers/staging/iio/magnetometer/hmc5843.c
@@ -643,11 +643,9 @@ static int hmc5843_probe(struct i2c_client *client,
struct iio_dev *indio_dev;
int err = 0;
- indio_dev = iio_device_alloc(sizeof(*data));
- if (indio_dev == NULL) {
- err = -ENOMEM;
- goto exit;
- }
+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+ if (!indio_dev)
+ return -ENOMEM;
/* default settings at probe */
data = iio_priv(indio_dev);
@@ -665,14 +663,9 @@ static int hmc5843_probe(struct i2c_client *client,
err = iio_device_register(indio_dev);
if (err)
- goto exit_free2;
+ return err;
return 0;
-
-exit_free2:
- iio_device_free(indio_dev);
-exit:
- return err;
}
static int hmc5843_remove(struct i2c_client *client)
@@ -682,7 +675,6 @@ static int hmc5843_remove(struct i2c_client *client)
iio_device_unregister(indio_dev);
/* sleep mode to save power */
hmc5843_configure(client, HMC5843_MODE_SLEEP);
- iio_device_free(indio_dev);
return 0;
}
--
1.7.9.5
next reply other threads:[~2013-09-11 10:13 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-11 9:55 Sachin Kamat [this message]
2013-09-11 9:55 ` [PATCH 02/10] staging: iio: ad2s1200: Use devm_* APIs Sachin Kamat
2013-09-14 10:46 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 03/10] staging: iio: ad2s1200: Use dev_err instead of pr_err Sachin Kamat
2013-09-14 10:47 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 04/10] staging: iio: ad2s1210: Use devm_iio_device_alloc Sachin Kamat
2013-09-14 10:51 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 05/10] staging: iio: ad2s90: " Sachin Kamat
2013-09-14 10:56 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 06/10] staging: iio: ade7753: " Sachin Kamat
2013-09-14 10:56 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 07/10] staging: iio: ade7754: " Sachin Kamat
2013-09-11 9:55 ` [PATCH 08/10] staging: iio: ade7758_core: " Sachin Kamat
2013-09-14 10:56 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 09/10] staging: iio: ade7759: " Sachin Kamat
2013-09-14 10:57 ` Jonathan Cameron
2013-09-11 9:55 ` [PATCH 10/10] staging: iio: ade7854: " Sachin Kamat
2013-09-14 11:00 ` Jonathan Cameron
2013-09-14 10:46 ` [PATCH 01/10] staging: iio: hmc5843: " 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=1378893325-31764-1-git-send-email-sachin.kamat@linaro.org \
--to=sachin.kamat@linaro.org \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=shubhrajyoti@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).