| Message ID | 4565950ddca2f78209dad49e169d4af7517db27e.1660127865.git.mazziesaccount@gmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Devm helpers for regulator get and enable | expand |
On 8/10/22 04:32, Matti Vaittinen wrote: > 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> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > drivers/hwmon/lm90.c | 21 ++------------------- > 1 file changed, 2 insertions(+), 19 deletions(-) > > diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c > index 3820f0e61510..2ab561ec367c 100644 > --- a/drivers/hwmon/lm90.c > +++ b/drivers/hwmon/lm90.c > @@ -1848,12 +1848,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 const struct hwmon_ops lm90_ops = { > .is_visible = lm90_is_visible, > .read = lm90_read, > @@ -1865,24 +1859,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)
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c index 3820f0e61510..2ab561ec367c 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c @@ -1848,12 +1848,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 const struct hwmon_ops lm90_ops = { .is_visible = lm90_is_visible, .read = lm90_read, @@ -1865,24 +1859,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)
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> --- drivers/hwmon/lm90.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-)