iio: dac: ad5380: use devm_regulator_get_enable_read_voltage()

Simplify the code by using devm_regulator_get_enable_read_voltage().

Signed-off-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20241023-iio-regulator-refactor-round-5-v1-1-d0bd396b3f50@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c
index 2e3e33f92bc0afebe30c5cdbef177648a0bc969c..7d1d7053c29ea8f083f52146477b02d8eb41b5a6 100644 (file)
--- a/drivers/iio/dac/ad5380.c
+++ b/drivers/iio/dac/ad5380.c
@@ -47,7 +47,6 @@ struct ad5380_chip_info {
  * struct ad5380_state - driver instance specific data
  * @regmap:            regmap instance used by the device
  * @chip_info:         chip model specific constants, available modes etc
- * @vref_reg:          vref supply regulator
  * @vref:              actual reference voltage used in uA
  * @pwr_down:          whether the chip is currently in power down mode
  * @lock:              lock to protect the data buffer during regmap ops
@@ -55,7 +54,6 @@ struct ad5380_chip_info {
 struct ad5380_state {
        struct regmap                   *regmap;
        const struct ad5380_chip_info   *chip_info;
-       struct regulator                *vref_reg;
        int                             vref;
        bool                            pwr_down;
        struct mutex                    lock;
@@ -400,42 +398,32 @@ static int ad5380_probe(struct device *dev, struct regmap *regmap,
        if (st->chip_info->int_vref == 2500)
                ctrl |= AD5380_CTRL_INT_VREF_2V5;
 
-       st->vref_reg = devm_regulator_get(dev, "vref");
-       if (!IS_ERR(st->vref_reg)) {
-               ret = regulator_enable(st->vref_reg);
-               if (ret) {
-                       dev_err(dev, "Failed to enable vref regulators: %d\n",
-                               ret);
-                       goto error_free_reg;
-               }
-
-               ret = regulator_get_voltage(st->vref_reg);
-               if (ret < 0)
-                       goto error_disable_reg;
-
-               st->vref = ret / 1000;
-       } else {
+       ret = devm_regulator_get_enable_read_voltage(dev, "vref");
+       if (ret < 0 && ret != -ENODEV) {
+               dev_err(dev, "Failed to get vref voltage: %d\n", ret);
+               goto error_free_reg;
+       }
+       if (ret == -ENODEV) {
                st->vref = st->chip_info->int_vref;
                ctrl |= AD5380_CTRL_INT_VREF_EN;
+       } else {
+               st->vref = ret / 1000;
        }
 
        ret = regmap_write(st->regmap, AD5380_REG_SF_CTRL, ctrl);
        if (ret) {
                dev_err(dev, "Failed to write to device: %d\n", ret);
-               goto error_disable_reg;
+               goto error_free_reg;
        }
 
        ret = iio_device_register(indio_dev);
        if (ret) {
                dev_err(dev, "Failed to register iio device: %d\n", ret);
-               goto error_disable_reg;
+               goto error_free_reg;
        }
 
        return 0;
 
-error_disable_reg:
-       if (!IS_ERR(st->vref_reg))
-               regulator_disable(st->vref_reg);
 error_free_reg:
        kfree(indio_dev->channels);
 
@@ -445,14 +433,10 @@ error_free_reg:
 static void ad5380_remove(struct device *dev)
 {
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct ad5380_state *st = iio_priv(indio_dev);
 
        iio_device_unregister(indio_dev);
 
        kfree(indio_dev->channels);
-
-       if (!IS_ERR(st->vref_reg))
-               regulator_disable(st->vref_reg);
 }
 
 static bool ad5380_reg_false(struct device *dev, unsigned int reg)