AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-28 02:15:21 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: iio: ad9832: clean-up regulator 'reg'

Browse Source 
Rename regulator 'reg' to 'avdd' so as to be clear what regulator it
stands for specifically. Additionally, get rid of local variable 'reg'
and use direct assignment instead. Update also the goto label pertaining
to the avdd regulator during disable.

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:35 +08:00 committed by Jonathan Cameron
parent a98461d79b
commit 43a07e48af
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/iio/frequency/ad9832.c
View File

@ -204,7 +204,6 @@ static int ad9832_probe(struct spi_device *spi)
struct ad9832_platform_data *pdata = dev_get_platdata(&spi->dev);
struct iio_dev *indio_dev;
struct ad9832_state *st;
struct regulator *reg;
int ret;
if (!pdata) {
@ -212,11 +211,11 @@ static int ad9832_probe(struct spi_device *spi)
return -ENODEV;
}
reg = devm_regulator_get(&spi->dev, "avdd");
if (IS_ERR(reg))
return PTR_ERR(reg);
st->avdd = devm_regulator_get(&spi->dev, "avdd");
if (IS_ERR(st->avdd))
return PTR_ERR(st->avdd);
ret = regulator_enable(reg);
ret = regulator_enable(st->avdd);
if (ret) {
dev_err(&spi->dev, "Failed to enable specified AVDD supply\n");
return ret;
@ -225,13 +224,13 @@ static int ad9832_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;
}
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
@ -241,7 +240,6 @@ static int ad9832_probe(struct spi_device *spi)
}
spi_set_drvdata(spi, indio_dev);
st = iio_priv(indio_dev);
st->reg = reg;
st->mclk = pdata->mclk;
st->spi = spi;
@ -327,8 +325,8 @@ static int ad9832_probe(struct spi_device *spi)
error_disable_dvdd:
regulator_disable(st->dvdd);
error_disable_reg:
regulator_disable(reg);
error_disable_avdd:
regulator_disable(st->avdd);
return ret;
}
@ -340,7 +338,7 @@ static int ad9832_remove(struct spi_device *spi)
iio_device_unregister(indio_dev);
regulator_disable(st->dvdd);
regulator_disable(st->reg);
regulator_disable(st->avdd);
return 0;
}

4
drivers/staging/iio/frequency/ad9832.h
View File

@ -58,7 +58,7 @@
/**
* struct ad9832_state - driver instance specific data
* @spi: spi_device
* @reg: supply regulator
* @avdd: supply regulator for the analog section
* @dvdd: supply regulator for the digital section
* @mclk: external master clock
* @ctrl_fp: cached frequency/phase control word
@ -77,7 +77,7 @@
struct ad9832_state {
struct spi_device *spi;
struct regulator *reg;
struct regulator *avdd;
struct regulator *dvdd;
unsigned long mclk;
unsigned short ctrl_fp;