]> Gentwo Git Trees - linux/.git/commitdiff
iio: dac: max5821: use devm_regulator_get_enable_read_voltage()
authorDavid Lechner <dlechner@baylibre.com>
Wed, 20 Nov 2024 21:33:34 +0000 (15:33 -0600)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 7 Dec 2024 17:47:58 +0000 (17:47 +0000)
Simplify the code by using devm_regulator_get_enable_read_voltage().

Signed-off-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20241120-iio-regulator-cleanup-round-6-v1-11-d5a5360f7ec3@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/dac/max5821.c

index 18ba3eaaad7564ebb043d9984dbf5c8302ab8353..b062a18be5e7967f4d96f4b2f37719c2bd93c60e 100644 (file)
@@ -32,7 +32,6 @@ enum max5821_device_ids {
 
 struct max5821_data {
        struct i2c_client       *client;
-       struct regulator        *vref_reg;
        unsigned short          vref_mv;
        bool                    powerdown[MAX5821_MAX_DAC_CHANNELS];
        u8                      powerdown_mode[MAX5821_MAX_DAC_CHANNELS];
@@ -295,11 +294,6 @@ static const struct iio_info max5821_info = {
        .write_raw = max5821_write_raw,
 };
 
-static void max5821_regulator_disable(void *reg)
-{
-       regulator_disable(reg);
-}
-
 static int max5821_probe(struct i2c_client *client)
 {
        const struct i2c_device_id *id = i2c_client_get_device_id(client);
@@ -321,32 +315,10 @@ static int max5821_probe(struct i2c_client *client)
                data->powerdown_mode[tmp] = MAX5821_100KOHM_TO_GND;
        }
 
-       data->vref_reg = devm_regulator_get(&client->dev, "vref");
-       if (IS_ERR(data->vref_reg))
-               return dev_err_probe(&client->dev, PTR_ERR(data->vref_reg),
-                                    "Failed to get vref regulator\n");
-
-       ret = regulator_enable(data->vref_reg);
-       if (ret) {
-               dev_err(&client->dev,
-                       "Failed to enable vref regulator: %d\n", ret);
-               return ret;
-       }
-
-       ret = devm_add_action_or_reset(&client->dev, max5821_regulator_disable,
-                                      data->vref_reg);
-       if (ret) {
-               dev_err(&client->dev,
-                       "Failed to add action to managed regulator: %d\n", ret);
-               return ret;
-       }
-
-       ret = regulator_get_voltage(data->vref_reg);
-       if (ret < 0) {
-               dev_err(&client->dev,
-                       "Failed to get voltage on regulator: %d\n", ret);
-               return ret;
-       }
+       ret = devm_regulator_get_enable_read_voltage(&client->dev, "vref");
+       if (ret)
+               return dev_err_probe(&client->dev, ret,
+                                    "Failed to get vref regulator voltage\n");
 
        data->vref_mv = ret / 1000;