hwmon: (lm90) simplify using devm_regulator_get_enable()
authorMatti Vaittinen <mazziesaccount@gmail.com>
Fri, 21 Oct 2022 13:18:43 +0000 (16:18 +0300)
committerGuenter Roeck <linux@roeck-us.net>
Mon, 5 Dec 2022 00:45:02 +0000 (16:45 -0800)
Drop open-coded pattern: 'devm_regulator_get(), regulator_enable(),
add_action_or_reset(regulator_disable)' and use the
devm_regulator_get_enable().

Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>
Link: https://lore.kernel.org/r/a1fa4364cbb775de25478117dd22dda0742089e3.1666357434.git.mazziesaccount@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
drivers/hwmon/lm90.c

index db595f7..a3f95ba 100644 (file)
@@ -2663,11 +2663,6 @@ static void lm90_remove_pec(void *dev)
        device_remove_file(dev, &dev_attr_pec);
 }
 
-static void lm90_regulator_disable(void *regulator)
-{
-       regulator_disable(regulator);
-}
-
 static int lm90_probe_channel_from_dt(struct i2c_client *client,
                                      struct device_node *child,
                                      struct lm90_data *data)
@@ -2749,24 +2744,13 @@ static int lm90_probe(struct i2c_client *client)
        struct device *dev = &client->dev;
        struct i2c_adapter *adapter = client->adapter;
        struct hwmon_channel_info *info;
-       struct regulator *regulator;
        struct device *hwmon_dev;
        struct lm90_data *data;
        int err;
 
-       regulator = devm_regulator_get(dev, "vcc");
-       if (IS_ERR(regulator))
-               return PTR_ERR(regulator);
-
-       err = regulator_enable(regulator);
-       if (err < 0) {
-               dev_err(dev, "Failed to enable regulator: %d\n", err);
-               return err;
-       }
-
-       err = devm_add_action_or_reset(dev, lm90_regulator_disable, regulator);
+       err = devm_regulator_get_enable(dev, "vcc");
        if (err)
-               return err;
+               return dev_err_probe(dev, err, "Failed to enable regulator\n");
 
        data = devm_kzalloc(dev, sizeof(struct lm90_data), GFP_KERNEL);
        if (!data)