From: Guenter Roeck <linux@roeck-us.net>
To: Alban Bedel <alban.bedel@aerq.com>
Cc: linux-hwmon@vger.kernel.org, Jean Delvare <jdelvare@suse.com>,
Rob Herring <robh+dt@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 3/3] hwmon: (lm75) Add regulator support
Date: Mon, 28 Sep 2020 09:39:02 -0700 [thread overview]
Message-ID: <20200928163902.GE106276@roeck-us.net> (raw)
In-Reply-To: <20200928153923.134151-4-alban.bedel@aerq.com>
On Mon, Sep 28, 2020 at 05:39:23PM +0200, Alban Bedel wrote:
> Add regulator support for boards where the sensor first need to be
> powered up before it can be used.
>
> Signed-off-by: Alban Bedel <alban.bedel@aerq.com>
> ---
> v2: Rely on dummy regulators instead of explicitly handling missing
> regulator
> ---
> drivers/hwmon/lm75.c | 23 +++++++++++++++++++++--
> 1 file changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
> index ba0be48aeadd..e394df648c26 100644
> --- a/drivers/hwmon/lm75.c
> +++ b/drivers/hwmon/lm75.c
> @@ -17,6 +17,7 @@
> #include <linux/of.h>
> #include <linux/regmap.h>
> #include <linux/util_macros.h>
> +#include <linux/regulator/consumer.h>
> #include "lm75.h"
>
> /*
> @@ -101,6 +102,7 @@ static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
> struct lm75_data {
> struct i2c_client *client;
> struct regmap *regmap;
> + struct regulator *vs;
> u8 orig_conf;
> u8 current_conf;
> u8 resolution; /* In bits, 9 to 16 */
> @@ -540,6 +542,7 @@ static void lm75_remove(void *data)
> struct i2c_client *client = lm75->client;
>
> i2c_smbus_write_byte_data(client, LM75_REG_CONF, lm75->orig_conf);
> + regulator_disable(lm75->vs);
> }
>
> static int
> @@ -567,6 +570,10 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
> data->client = client;
> data->kind = kind;
>
> + data->vs = devm_regulator_get(dev, "vs");
> + if (IS_ERR(data->vs))
> + return PTR_ERR(data->vs);
> +
> data->regmap = devm_regmap_init_i2c(client, &lm75_regmap_config);
> if (IS_ERR(data->regmap))
> return PTR_ERR(data->regmap);
> @@ -581,11 +588,19 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)
> data->sample_time = data->params->default_sample_time;
> data->resolution = data->params->default_resolution;
>
> + /* Enable the power */
> + err = regulator_enable(data->vs);
> + if (err) {
> + dev_err(dev, "failed to enable regulator: %d\n", err);
> + return err;
> + }
> +
> /* Cache original configuration */
> status = i2c_smbus_read_byte_data(client, LM75_REG_CONF);
> if (status < 0) {
> dev_dbg(dev, "Can't read config? %d\n", status);
> - return status;
> + err = status;
> + goto disable_regulator;
The point of using devm_add_action_or_reset() was specifically to avoid having
to have the cleanup gotos. On top of that, the lm75_remove() function was
specifically intended to clean up configuration data, not to do anything else.
While hijacking lm75_remove() to also disable the regulator is technically
correct, it makes the code more difficult to understand, and it creates a
potential source for subsequently introduced bugs. Right now I am not inclined
to accept this code as-is. Please provide arguments for handling the cleanup
this way instead of using devm_add_action_or_reset().
Thanks,
Guenter
next prev parent reply other threads:[~2020-09-28 16:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 15:39 [PATCH v2 0/3] hwmon: (lm75) Add regulator support Alban Bedel
2020-09-28 15:39 ` [PATCH v2 1/3] dt-bindings: hwmon: Convert lm75 bindings to yaml Alban Bedel
2020-09-29 20:07 ` Rob Herring
2020-09-28 15:39 ` [PATCH v2 2/3] dt-bindings: hwmon: Add the +vs supply to the lm75 bindings Alban Bedel
2020-09-29 20:08 ` Rob Herring
2020-09-28 15:39 ` [PATCH v2 3/3] hwmon: (lm75) Add regulator support Alban Bedel
2020-09-28 16:39 ` Guenter Roeck [this message]
2020-09-29 14:05 ` Bedel, Alban
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200928163902.GE106276@roeck-us.net \
--to=linux@roeck-us.net \
--cc=alban.bedel@aerq.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jdelvare@suse.com \
--cc=lgirdwood@gmail.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).