]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: amplifiers: ada4250: use devm_regulator_get_enable_read_voltage()
authorDavid Lechner <dlechner@baylibre.com>
Wed, 11 Jun 2025 21:33:03 +0000 (16:33 -0500)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Thu, 26 Jun 2025 18:32:54 +0000 (19:32 +0100)
Use devm_regulator_get_enable_read_voltage() to simplify the code.

Replace 1000000 with MICRO while we are touching this for better
readability.

Signed-off-by: David Lechner <dlechner@baylibre.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20250611-iio-amplifiers-ada4250-simplify-data-buffer-in-init-v3-3-bf85ddea79f2@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/amplifiers/ada4250.c

index 1bd7c0c3c695b3872b8c389fb4ae89bf5d24f51c..c367c53a075b26327a221e0c3a9dc8e788891f32 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
 #include <linux/types.h>
+#include <linux/units.h>
 
 /* ADA4250 Register Map */
 #define ADA4250_REG_GAIN_MUX        0x00
@@ -55,9 +56,9 @@ enum ada4250_current_bias {
 struct ada4250_state {
        struct spi_device       *spi;
        struct regmap           *regmap;
-       struct regulator        *reg;
        /* Protect against concurrent accesses to the device and data content */
        struct mutex            lock;
+       int                     avdd_uv;
        u8                      bias;
        u8                      gain;
        int                     offset_uv;
@@ -91,8 +92,7 @@ static int ada4250_set_offset_uv(struct iio_dev *indio_dev,
        if (st->bias == 0 || st->bias == 3)
                return -EINVAL;
 
-       voltage_v = regulator_get_voltage(st->reg);
-       voltage_v = DIV_ROUND_CLOSEST(voltage_v, 1000000);
+       voltage_v = DIV_ROUND_CLOSEST(st->avdd_uv, MICRO);
 
        if (st->bias == ADA4250_BIAS_AVDD)
                x[0] = voltage_v;
@@ -292,11 +292,6 @@ static const struct iio_chan_spec ada4250_channels[] = {
        }
 };
 
-static void ada4250_reg_disable(void *data)
-{
-       regulator_disable(data);
-}
-
 static int ada4250_init(struct ada4250_state *st)
 {
        struct device *dev = &st->spi->dev;
@@ -305,21 +300,11 @@ static int ada4250_init(struct ada4250_state *st)
 
        st->refbuf_en = device_property_read_bool(dev, "adi,refbuf-enable");
 
-       st->reg = devm_regulator_get(dev, "avdd");
-       if (IS_ERR(st->reg))
-               return dev_err_probe(dev, PTR_ERR(st->reg),
+       st->avdd_uv = devm_regulator_get_enable_read_voltage(dev, "avdd");
+       if (st->avdd_uv < 0)
+               return dev_err_probe(dev, st->avdd_uv,
                                     "failed to get the AVDD voltage\n");
 
-       ret = regulator_enable(st->reg);
-       if (ret) {
-               dev_err(dev, "Failed to enable specified AVDD supply\n");
-               return ret;
-       }
-
-       ret = devm_add_action_or_reset(dev, ada4250_reg_disable, st->reg);
-       if (ret)
-               return ret;
-
        ret = regmap_write(st->regmap, ADA4250_REG_RESET,
                           FIELD_PREP(ADA4250_RESET_MSK, 1));
        if (ret)