Commit 43a07e48 authored by Eva Rachel Retuya's avatar Eva Rachel Retuya Committed by Jonathan Cameron

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

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: default avatarEva Rachel Retuya <eraretuya@gmail.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent a98461d7
...@@ -204,7 +204,6 @@ static int ad9832_probe(struct spi_device *spi) ...@@ -204,7 +204,6 @@ static int ad9832_probe(struct spi_device *spi)
struct ad9832_platform_data *pdata = dev_get_platdata(&spi->dev); struct ad9832_platform_data *pdata = dev_get_platdata(&spi->dev);
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
struct ad9832_state *st; struct ad9832_state *st;
struct regulator *reg;
int ret; int ret;
if (!pdata) { if (!pdata) {
...@@ -212,11 +211,11 @@ static int ad9832_probe(struct spi_device *spi) ...@@ -212,11 +211,11 @@ static int ad9832_probe(struct spi_device *spi)
return -ENODEV; return -ENODEV;
} }
reg = devm_regulator_get(&spi->dev, "avdd"); st->avdd = devm_regulator_get(&spi->dev, "avdd");
if (IS_ERR(reg)) if (IS_ERR(st->avdd))
return PTR_ERR(reg); return PTR_ERR(st->avdd);
ret = regulator_enable(reg); ret = regulator_enable(st->avdd);
if (ret) { if (ret) {
dev_err(&spi->dev, "Failed to enable specified AVDD supply\n"); dev_err(&spi->dev, "Failed to enable specified AVDD supply\n");
return ret; return ret;
...@@ -225,13 +224,13 @@ static int ad9832_probe(struct spi_device *spi) ...@@ -225,13 +224,13 @@ static int ad9832_probe(struct spi_device *spi)
st->dvdd = devm_regulator_get(&spi->dev, "dvdd"); st->dvdd = devm_regulator_get(&spi->dev, "dvdd");
if (IS_ERR(st->dvdd)) { if (IS_ERR(st->dvdd)) {
ret = PTR_ERR(st->dvdd); ret = PTR_ERR(st->dvdd);
goto error_disable_reg; goto error_disable_avdd;
} }
ret = regulator_enable(st->dvdd); ret = regulator_enable(st->dvdd);
if (ret) { if (ret) {
dev_err(&spi->dev, "Failed to enable specified DVDD supply\n"); 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)); indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
...@@ -241,7 +240,6 @@ static int ad9832_probe(struct spi_device *spi) ...@@ -241,7 +240,6 @@ static int ad9832_probe(struct spi_device *spi)
} }
spi_set_drvdata(spi, indio_dev); spi_set_drvdata(spi, indio_dev);
st = iio_priv(indio_dev); st = iio_priv(indio_dev);
st->reg = reg;
st->mclk = pdata->mclk; st->mclk = pdata->mclk;
st->spi = spi; st->spi = spi;
...@@ -327,8 +325,8 @@ static int ad9832_probe(struct spi_device *spi) ...@@ -327,8 +325,8 @@ static int ad9832_probe(struct spi_device *spi)
error_disable_dvdd: error_disable_dvdd:
regulator_disable(st->dvdd); regulator_disable(st->dvdd);
error_disable_reg: error_disable_avdd:
regulator_disable(reg); regulator_disable(st->avdd);
return ret; return ret;
} }
...@@ -340,7 +338,7 @@ static int ad9832_remove(struct spi_device *spi) ...@@ -340,7 +338,7 @@ static int ad9832_remove(struct spi_device *spi)
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
regulator_disable(st->dvdd); regulator_disable(st->dvdd);
regulator_disable(st->reg); regulator_disable(st->avdd);
return 0; return 0;
} }
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
/** /**
* struct ad9832_state - driver instance specific data * struct ad9832_state - driver instance specific data
* @spi: spi_device * @spi: spi_device
* @reg: supply regulator * @avdd: supply regulator for the analog section
* @dvdd: supply regulator for the digital section * @dvdd: supply regulator for the digital section
* @mclk: external master clock * @mclk: external master clock
* @ctrl_fp: cached frequency/phase control word * @ctrl_fp: cached frequency/phase control word
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
struct ad9832_state { struct ad9832_state {
struct spi_device *spi; struct spi_device *spi;
struct regulator *reg; struct regulator *avdd;
struct regulator *dvdd; struct regulator *dvdd;
unsigned long mclk; unsigned long mclk;
unsigned short ctrl_fp; unsigned short ctrl_fp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment