From: Eva Rachel Retuya <eraretuya@gmail.com>
To: linux-iio@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Cc: lars@metafoo.de, Michael.Hennerich@analog.com, jic23@kernel.org,
knaack.h@gmx.de, pmeerw@pmeerw.net, gregkh@linuxfoundation.org,
Eva Rachel Retuya <eraretuya@gmail.com>
Subject: [PATCH 4/6] staging: iio: ad7192: rename regulator 'reg' to 'avdd'
Date: Tue, 1 Nov 2016 01:04:33 +0800 [thread overview]
Message-ID: <1477933475-21914-5-git-send-email-eraretuya@gmail.com> (raw)
In-Reply-To: <1477933475-21914-1-git-send-email-eraretuya@gmail.com>
Rename regulator 'reg' to 'avdd' so as to be clear what regulator it
stands for specifically. Also, update the goto label accordingly.
Signed-off-by: Eva Rachel Retuya <eraretuya@gmail.com>
---
drivers/staging/iio/adc/ad7192.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
index 3f8dc66..1fb68c0 100644
--- a/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@ -152,7 +152,7 @@
*/
struct ad7192_state {
- struct regulator *reg;
+ struct regulator *avdd;
struct regulator *dvdd;
u16 int_vref_mv;
u32 mclk;
@@ -634,11 +634,11 @@ static int ad7192_probe(struct spi_device *spi)
st = iio_priv(indio_dev);
- st->reg = devm_regulator_get(&spi->dev, "avdd");
- if (IS_ERR(st->reg))
- return PTR_ERR(st->reg);
+ st->avdd = devm_regulator_get(&spi->dev, "avdd");
+ if (IS_ERR(st->avdd))
+ return PTR_ERR(st->avdd);
- ret = regulator_enable(st->reg);
+ ret = regulator_enable(st->avdd);
if (ret) {
dev_err(&spi->dev, "Failed to enable specified AVdd supply\n");
return ret;
@@ -647,16 +647,16 @@ static int ad7192_probe(struct spi_device *spi)
st->dvdd = devm_regulator_get(&spi->dev, "dvdd");
if (IS_ERR(st->dvdd)) {
ret = PTR_ERR(st->dvdd);
- goto error_disable_reg;
+ goto error_disable_avdd;
}
ret = regulator_enable(st->dvdd);
if (ret) {
dev_err(&spi->dev, "Failed to enable specified DVdd supply\n");
- goto error_disable_reg;
+ goto error_disable_avdd;
}
- voltage_uv = regulator_get_voltage(st->reg);
+ voltage_uv = regulator_get_voltage(st->avdd);
if (pdata->vref_mv)
st->int_vref_mv = pdata->vref_mv;
@@ -706,8 +706,8 @@ static int ad7192_probe(struct spi_device *spi)
ad_sd_cleanup_buffer_and_trigger(indio_dev);
error_disable_dvdd:
regulator_disable(st->dvdd);
-error_disable_reg:
- regulator_disable(st->reg);
+error_disable_avdd:
+ regulator_disable(st->avdd);
return ret;
}
@@ -721,7 +721,7 @@ static int ad7192_remove(struct spi_device *spi)
ad_sd_cleanup_buffer_and_trigger(indio_dev);
regulator_disable(st->dvdd);
- regulator_disable(st->reg);
+ regulator_disable(st->avdd);
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2016-10-31 17:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-31 17:04 [PATCH 0/6] staging: iio: regulator clean-up Eva Rachel Retuya
2016-10-31 17:04 ` [PATCH 1/6] staging: iio: set proper supply name to devm_regulator_get() Eva Rachel Retuya
2016-11-01 4:03 ` Matt Ranostay
2016-11-01 19:58 ` Lars-Peter Clausen
2016-11-05 12:58 ` Jonathan Cameron
2016-11-05 16:14 ` Jonathan Cameron
2016-11-04 10:17 ` Eva Rachel Retuya
2016-11-05 16:14 ` Jonathan Cameron
2016-10-31 17:04 ` [PATCH 2/6] staging: iio: rework regulator handling Eva Rachel Retuya
2016-11-05 16:18 ` Jonathan Cameron
2016-10-31 17:04 ` [PATCH 3/6] staging: iio: ad7192: add DVdd regulator Eva Rachel Retuya
2016-11-05 16:19 ` Jonathan Cameron
2016-10-31 17:04 ` Eva Rachel Retuya [this message]
2016-11-05 16:21 ` [PATCH 4/6] staging: iio: ad7192: rename regulator 'reg' to 'avdd' Jonathan Cameron
2016-10-31 17:04 ` [PATCH 5/6] staging: iio: ad9832: add DVDD regulator Eva Rachel Retuya
2016-11-05 16:22 ` Jonathan Cameron
2016-10-31 17:04 ` [PATCH 6/6] staging: iio: ad9832: clean-up regulator 'reg' Eva Rachel Retuya
2016-11-05 16:23 ` 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=1477933475-21914-5-git-send-email-eraretuya@gmail.com \
--to=eraretuya@gmail.com \
--cc=Michael.Hennerich@analog.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/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).