Skip to content

Commit

Permalink
staging: iio: rework regulator handling
Browse files Browse the repository at this point in the history 
Currently, the affected drivers ignore all errors from regulator_get().
The way it is now, it also breaks probe deferral (EPROBE_DEFER). The
correct behavior is to propagate the error to the upper layers so they
can handle it accordingly.

Rework the regulator handling so that it matches the standard behavior.
If the specific design uses a static always-on regulator and does not
explicitly specify it, regulator_get() will return the dummy regulator.

The following semantic patch was used to apply the change:
@r1@
expression reg, dev, en, volt;
@@

reg = \(devm_regulator_get\|regulator_get\)(dev, ...);
if (
- !
   IS_ERR(reg))
+	return PTR_ERR(reg);
(
- {	en = regulator_enable(reg);
-	if (en) return en; }
+
+	en = regulator_enable(reg);
+	if (en) {
+		dev_err(dev, "Failed to enable specified supply\n");
+		return en; }
|
+
- {	en = regulator_enable(reg);
-	if (en)	return en;
-	volt = regulator_get_voltage(reg); }
+	en = regulator_enable(reg);
+	if (en) {
+		dev_err(dev, "Failed to enable specified supply\n");
+		return en;
+	}
+	volt = regulator_get_voltage(reg);
)

@r2@
expression arg;
@@

-	if (!IS_ERR(arg)) regulator_disable(arg);
+	regulator_disable(arg);

Hand-edit the debugging prints with the supply name to become more
specific.

Suggested-by: Lars-Peter Clausen <[email protected]>
Signed-off-by: Eva Rachel Retuya <[email protected]>
Signed-off-by: Jonathan Cameron <[email protected]>
  • Loading branch information
@eraretuya @jic23
eraretuya authored and jic23 committed Nov 5, 2016
1 parent c834e17 commit 3925ff0
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 43 deletions.
18 changes: 9 additions & 9 deletions drivers/staging/iio/adc/ad7192.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -634,13 +634,15 @@ 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)) {
ret = regulator_enable(st->reg);
if (ret)
return ret;
if (IS_ERR(st->reg))
return PTR_ERR(st->reg);

voltage_uv = regulator_get_voltage(st->reg);
ret = regulator_enable(st->reg);
if (ret) {
dev_err(&spi->dev, "Failed to enable specified AVdd supply\n");
return ret;
}
voltage_uv = regulator_get_voltage(st->reg);

if (pdata->vref_mv)
st->int_vref_mv = pdata->vref_mv;
Expand Down Expand Up @@ -689,8 +691,7 @@ static int ad7192_probe(struct spi_device *spi)
error_remove_trigger:
ad_sd_cleanup_buffer_and_trigger(indio_dev);
error_disable_reg:
if (!IS_ERR(st->reg))
regulator_disable(st->reg);
regulator_disable(st->reg);

return ret;
}
Expand All @@ -703,8 +704,7 @@ static int ad7192_remove(struct spi_device *spi)
iio_device_unregister(indio_dev);
ad_sd_cleanup_buffer_and_trigger(indio_dev);

if (!IS_ERR(st->reg))
regulator_disable(st->reg);
regulator_disable(st->reg);

return 0;
}
Expand Down
18 changes: 9 additions & 9 deletions drivers/staging/iio/adc/ad7780.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,15 @@ static int ad7780_probe(struct spi_device *spi)
ad_sd_init(&st->sd, indio_dev, spi, &ad7780_sigma_delta_info);

st->reg = devm_regulator_get(&spi->dev, "avdd");
if (!IS_ERR(st->reg)) {
ret = regulator_enable(st->reg);
if (ret)
return ret;
if (IS_ERR(st->reg))
return PTR_ERR(st->reg);

voltage_uv = regulator_get_voltage(st->reg);
ret = regulator_enable(st->reg);
if (ret) {
dev_err(&spi->dev, "Failed to enable specified AVdd supply\n");
return ret;
}
voltage_uv = regulator_get_voltage(st->reg);

st->chip_info =
&ad7780_chip_info_tbl[spi_get_device_id(spi)->driver_data];
Expand Down Expand Up @@ -222,8 +224,7 @@ static int ad7780_probe(struct spi_device *spi)
error_cleanup_buffer_and_trigger:
ad_sd_cleanup_buffer_and_trigger(indio_dev);
error_disable_reg:
if (!IS_ERR(st->reg))
regulator_disable(st->reg);
regulator_disable(st->reg);

return ret;
}
Expand All @@ -236,8 +237,7 @@ static int ad7780_remove(struct spi_device *spi)
iio_device_unregister(indio_dev);
ad_sd_cleanup_buffer_and_trigger(indio_dev);

if (!IS_ERR(st->reg))
regulator_disable(st->reg);
regulator_disable(st->reg);

return 0;
}
Expand Down
17 changes: 9 additions & 8 deletions drivers/staging/iio/frequency/ad9832.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,13 @@ static int ad9832_probe(struct spi_device *spi)
}

reg = devm_regulator_get(&spi->dev, "avdd");
if (!IS_ERR(reg)) {
ret = regulator_enable(reg);
if (ret)
return ret;
if (IS_ERR(reg))
return PTR_ERR(reg);

ret = regulator_enable(reg);
if (ret) {
dev_err(&spi->dev, "Failed to enable specified AVDD supply\n");
return ret;
}

indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
Expand Down Expand Up @@ -311,8 +314,7 @@ static int ad9832_probe(struct spi_device *spi)
return 0;

error_disable_reg:
if (!IS_ERR(reg))
regulator_disable(reg);
regulator_disable(reg);

return ret;
}
Expand All @@ -323,8 +325,7 @@ static int ad9832_remove(struct spi_device *spi)
struct ad9832_state *st = iio_priv(indio_dev);

iio_device_unregister(indio_dev);
if (!IS_ERR(st->reg))
regulator_disable(st->reg);
regulator_disable(st->reg);

return 0;
}
Expand Down
17 changes: 9 additions & 8 deletions drivers/staging/iio/frequency/ad9834.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,10 +330,13 @@ static int ad9834_probe(struct spi_device *spi)
}

reg = devm_regulator_get(&spi->dev, "avdd");
if (!IS_ERR(reg)) {
ret = regulator_enable(reg);
if (ret)
return ret;
if (IS_ERR(reg))
return PTR_ERR(reg);

ret = regulator_enable(reg);
if (ret) {
dev_err(&spi->dev, "Failed to enable specified AVDD supply\n");
return ret;
}

indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
Expand Down Expand Up @@ -416,8 +419,7 @@ static int ad9834_probe(struct spi_device *spi)
return 0;

error_disable_reg:
if (!IS_ERR(reg))
regulator_disable(reg);
regulator_disable(reg);

return ret;
}
Expand All @@ -428,8 +430,7 @@ static int ad9834_remove(struct spi_device *spi)
struct ad9834_state *st = iio_priv(indio_dev);

iio_device_unregister(indio_dev);
if (!IS_ERR(st->reg))
regulator_disable(st->reg);
regulator_disable(st->reg);

return 0;
}
Expand Down
19 changes: 10 additions & 9 deletions drivers/staging/iio/impedance-analyzer/ad5933.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,12 +724,15 @@ static int ad5933_probe(struct i2c_client *client,
pdata = &ad5933_default_pdata;

st->reg = devm_regulator_get(&client->dev, "vdd");
if (!IS_ERR(st->reg)) {
ret = regulator_enable(st->reg);
if (ret)
return ret;
voltage_uv = regulator_get_voltage(st->reg);
if (IS_ERR(st->reg))
return PTR_ERR(st->reg);

ret = regulator_enable(st->reg);
if (ret) {
dev_err(&client->dev, "Failed to enable specified VDD supply\n");
return ret;
}
voltage_uv = regulator_get_voltage(st->reg);

if (voltage_uv)
st->vref_mv = voltage_uv / 1000;
Expand Down Expand Up @@ -772,8 +775,7 @@ static int ad5933_probe(struct i2c_client *client,
error_unreg_ring:
iio_kfifo_free(indio_dev->buffer);
error_disable_reg:
if (!IS_ERR(st->reg))
regulator_disable(st->reg);
regulator_disable(st->reg);

return ret;
}
Expand All @@ -785,8 +787,7 @@ static int ad5933_remove(struct i2c_client *client)

iio_device_unregister(indio_dev);
iio_kfifo_free(indio_dev->buffer);
if (!IS_ERR(st->reg))
regulator_disable(st->reg);
regulator_disable(st->reg);

return 0;
}
Expand Down

0 comments on commit 3925ff0

Please sign in to comment.