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,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH 09/11] iio: adc: nau7802: Use devm_iio_device_alloc
Date: Tue, 23 Jul 2013 14:28:15 +0530 [thread overview]
Message-ID: <1374569897-3858-10-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: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/iio/adc/nau7802.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/iio/adc/nau7802.c b/drivers/iio/adc/nau7802.c
index 70fa171..bdf0346 100644
--- a/drivers/iio/adc/nau7802.c
+++ b/drivers/iio/adc/nau7802.c
@@ -404,7 +404,7 @@ static int nau7802_probe(struct i2c_client *client,
return -EINVAL;
}
- indio_dev = iio_device_alloc(sizeof(*st));
+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*st));
if (indio_dev == NULL)
return -ENOMEM;
@@ -423,13 +423,13 @@ static int nau7802_probe(struct i2c_client *client,
ret = i2c_smbus_write_byte_data(st->client, NAU7802_REG_PUCTRL,
NAU7802_PUCTRL_RR_BIT);
if (ret < 0)
- goto error_free_indio;
+ return ret;
/* Enter normal operation mode */
ret = i2c_smbus_write_byte_data(st->client, NAU7802_REG_PUCTRL,
NAU7802_PUCTRL_PUD_BIT);
if (ret < 0)
- goto error_free_indio;
+ return ret;
/*
* After about 200 usecs, the device should be ready and then
@@ -438,9 +438,9 @@ static int nau7802_probe(struct i2c_client *client,
udelay(210);
ret = i2c_smbus_read_byte_data(st->client, NAU7802_REG_PUCTRL);
if (ret < 0)
- goto error_free_indio;
+ return ret;
if (!(ret & NAU7802_PUCTRL_PUR_BIT))
- goto error_free_indio;
+ return ret;
of_property_read_u32(np, "nuvoton,vldo", &tmp);
st->vref_mv = tmp;
@@ -452,17 +452,17 @@ static int nau7802_probe(struct i2c_client *client,
ret = i2c_smbus_write_byte_data(st->client, NAU7802_REG_PUCTRL, data);
if (ret < 0)
- goto error_free_indio;
+ return ret;
ret = i2c_smbus_write_byte_data(st->client, NAU7802_REG_ADC_CTRL, 0x30);
if (ret < 0)
- goto error_free_indio;
+ return ret;
if (tmp >= 2400) {
data = NAU7802_CTRL1_VLDO((4500 - tmp) / 300);
ret = i2c_smbus_write_byte_data(st->client, NAU7802_REG_CTRL1,
data);
if (ret < 0)
- goto error_free_indio;
+ return ret;
}
/* Populate available ADC input ranges */
@@ -533,8 +533,6 @@ error_device_register:
error_free_irq:
if (client->irq)
free_irq(client->irq, indio_dev);
-error_free_indio:
- iio_device_free(indio_dev);
return ret;
}
@@ -549,7 +547,6 @@ static int nau7802_remove(struct i2c_client *client)
mutex_destroy(&st->data_lock);
if (client->irq)
free_irq(client->irq, indio_dev);
- 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 ` [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 ` Sachin Kamat [this message]
2013-07-23 9:31 ` [PATCH 09/11] iio: adc: nau7802: Use devm_iio_device_alloc 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-10-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=maxime.ripard@free-electrons.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).