iio: dac: ad5791: Use devm_regulator_get_enable_read_voltage

Simplify probe by using of the devm_regulator_get_enable_read_voltage.

Suggested-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: David Lechner <dlechner@baylibre.com>
Signed-off-by: Axel Haslam <ahaslam@baylibre.com>
Link: https://patch.msgid.link/20241031071746.848694-6-ahaslam@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c
index c5d4d75..92d47e7 100644 (file)
--- a/drivers/iio/dac/ad5791.c
+++ b/drivers/iio/dac/ad5791.c
@@ -360,32 +360,6 @@ static int ad5791_probe(struct spi_device *spi)
        if (IS_ERR(st->gpio_ldac))
                return PTR_ERR(st->gpio_ldac);
 
-       st->reg_vdd = devm_regulator_get(&spi->dev, "vdd");
-       if (!IS_ERR(st->reg_vdd)) {
-               ret = regulator_enable(st->reg_vdd);
-               if (ret)
-                       return ret;
-
-               ret = regulator_get_voltage(st->reg_vdd);
-               if (ret < 0)
-                       goto error_disable_reg_pos;
-
-               pos_voltage_uv = ret;
-       }
-
-       st->reg_vss = devm_regulator_get(&spi->dev, "vss");
-       if (!IS_ERR(st->reg_vss)) {
-               ret = regulator_enable(st->reg_vss);
-               if (ret)
-                       goto error_disable_reg_pos;
-
-               ret = regulator_get_voltage(st->reg_vss);
-               if (ret < 0)
-                       goto error_disable_reg_neg;
-
-               neg_voltage_uv = ret;
-       }
-
        st->pwr_down = true;
        st->spi = spi;
 
@@ -395,7 +369,17 @@ static int ad5791_probe(struct spi_device *spi)
                use_rbuf_gain2 = device_property_read_bool(&spi->dev,
                                                           "adi,rbuf-gain2-en");
 
-       if (!IS_ERR(st->reg_vss) && !IS_ERR(st->reg_vdd)) {
+       pos_voltage_uv = devm_regulator_get_enable_read_voltage(&spi->dev, "vdd");
+       if (pos_voltage_uv < 0 && pos_voltage_uv != -ENODEV)
+               return dev_err_probe(&spi->dev, pos_voltage_uv,
+                                    "failed to get vdd voltage\n");
+
+       neg_voltage_uv = devm_regulator_get_enable_read_voltage(&spi->dev, "vss");
+       if (neg_voltage_uv < 0 && neg_voltage_uv != -ENODEV)
+               return dev_err_probe(&spi->dev, neg_voltage_uv,
+                                    "failed to get vss voltage\n");
+
+       if (neg_voltage_uv >= 0 && pos_voltage_uv >= 0) {
                st->vref_mv = (pos_voltage_uv + neg_voltage_uv) / 1000;
                st->vref_neg_mv = neg_voltage_uv / 1000;
        } else if (pdata) {
@@ -411,7 +395,7 @@ static int ad5791_probe(struct spi_device *spi)
        } else {
                ret = ad5791_spi_write(st, AD5791_ADDR_SW_CTRL, AD5791_SWCTRL_RESET);
                if (ret)
-                       goto error_disable_reg_neg;
+                       return dev_err_probe(&spi->dev, ret, "fail to reset\n");
        }
 
        st->chip_info = spi_get_device_match_data(spi);
@@ -425,7 +409,7 @@ static int ad5791_probe(struct spi_device *spi)
        ret = ad5791_spi_write(st, AD5791_ADDR_CTRL, st->ctrl |
                AD5791_CTRL_OPGND | AD5791_CTRL_DACTRI);
        if (ret)
-               goto error_disable_reg_neg;
+               return dev_err_probe(&spi->dev, ret, "fail to write ctrl register\n");
 
        spi_set_drvdata(spi, indio_dev);
        indio_dev->info = &ad5791_info;
@@ -435,30 +419,16 @@ static int ad5791_probe(struct spi_device *spi)
        indio_dev->name = st->chip_info->name;
        ret = iio_device_register(indio_dev);
        if (ret)
-               goto error_disable_reg_neg;
+               return dev_err_probe(&spi->dev, ret, "unable to register iio device\n");
 
        return 0;
-
-error_disable_reg_neg:
-       if (!IS_ERR(st->reg_vss))
-               regulator_disable(st->reg_vss);
-error_disable_reg_pos:
-       if (!IS_ERR(st->reg_vdd))
-               regulator_disable(st->reg_vdd);
-       return ret;
 }
 
 static void ad5791_remove(struct spi_device *spi)
 {
        struct iio_dev *indio_dev = spi_get_drvdata(spi);
-       struct ad5791_state *st = iio_priv(indio_dev);
 
        iio_device_unregister(indio_dev);
-       if (!IS_ERR(st->reg_vdd))
-               regulator_disable(st->reg_vdd);
-
-       if (!IS_ERR(st->reg_vss))
-               regulator_disable(st->reg_vss);
 }
 
 static const struct of_device_id ad5791_of_match[] = {