Commit bba63de0 authored by Matti Vaittinen's avatar Matti Vaittinen Committed by Guenter Roeck
Browse files

hwmon: (adm1177) simplify using devm_regulator_get_enable() 



Drop open-coded pattern: 'devm_regulator_get(), regulator_enable(),
add_action_or_reset(regulator_disable)' and use the
devm_regulator_get_enable() and drop the pointer to the regulator.
This simplifies code and makes it less tempting to add manual control
for the regulator which is also controlled by devm.

Signed-off-by: default avatarMatti Vaittinen <mazziesaccount@gmail.com>
Link: https://lore.kernel.org/r/7773541795f280db31dd981ffc21df8a630b794a.1666357434.git.mazziesaccount@gmail.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent ad804a4d

drivers/hwmon/adm1177.c

+3 −24
Original line number Diff line number Diff line
@@ -26,14 +26,12 @@ 
/**

 * struct adm1177_state - driver instance specific data

 * @client:		pointer to i2c client

 * @reg:		regulator info for the power supply of the device

 * @r_sense_uohm:	current sense resistor value

 * @alert_threshold_ua:	current limit for shutdown

 * @vrange_high:	internal voltage divider

 */

struct adm1177_state {

	struct i2c_client	*client;

	struct regulator	*reg;

	u32			r_sense_uohm;

	u32			alert_threshold_ua;

	bool			vrange_high;
@@ -189,13 +187,6 @@ static const struct hwmon_chip_info adm1177_chip_info = { 
	.info = adm1177_info,

};



static void adm1177_remove(void *data)

{

	struct adm1177_state *st = data;



	regulator_disable(st->reg);

}



static int adm1177_probe(struct i2c_client *client)

{

	struct device *dev = &client->dev;
@@ -210,22 +201,10 @@ static int adm1177_probe(struct i2c_client *client) 


	st->client = client;



	st->reg = devm_regulator_get_optional(&client->dev, "vref");

	if (IS_ERR(st->reg)) {

		if (PTR_ERR(st->reg) == -EPROBE_DEFER)

	ret = devm_regulator_get_enable_optional(&client->dev, "vref");

	if (ret == -EPROBE_DEFER)

		return -EPROBE_DEFER;



		st->reg = NULL;

	} else {

		ret = regulator_enable(st->reg);

		if (ret)

			return ret;

		ret = devm_add_action_or_reset(&client->dev, adm1177_remove,

					       st);

		if (ret)

			return ret;

	}



	if (device_property_read_u32(dev, "shunt-resistor-micro-ohms",

				     &st->r_sense_uohm))

		st->r_sense_uohm = 0;