davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: iio: ad7192: rename regulator 'reg' to 'avdd'

Browse Source 
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>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Eva Rachel Retuya 2016-11-01 01:04:33 +08:00 committed by Jonathan Cameron
parent cb8bb16caf
commit 9d1548143f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/iio/adc/ad7192.c
View File

@ -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 @@ error_remove_trigger:
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;
}