From: Guenter Roeck <linux@roeck-us.net>
To: Romain Izard <romain.izard.pro@gmail.com>
Cc: Sebastian Reichel <sre@kernel.org>,
Andrey Smirnov <andrew.smirnov@gmail.com>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] power: supply: register HWMON devices with valid names
Date: Thu, 22 Aug 2019 09:12:07 -0700 [thread overview]
Message-ID: <20190822161207.GB6992@roeck-us.net> (raw)
In-Reply-To: <20190822150919.18290-1-romain.izard.pro@gmail.com>
On Thu, Aug 22, 2019 at 05:09:19PM +0200, Romain Izard wrote:
> With the introduction of the HWMON compatibility layer to the power
> supply framework in Linux 5.3, all power supply devices' names can be
> used directly to create HWMON devices with the same names.
>
> But HWMON has rules on allowable names that are different from the power
> supply framework. The dash character is forbidden, as it is used by the
> libsensors library in userspace as a separator, whereas this character
> is used in the device names in more than half of the existing power
> supply drivers. This last case is consistent with the typical naming
> usage with MFD and Device Tree.
>
> This leads to warnings in the kernel log, with the format:
>
> power_supply gpio-charger: hwmon: \
> 'gpio-charger' is not a valid name attribute, please fix
>
> Add a protection to power_supply_add_hwmon_sysfs() that replaces any
> dash in the device name with an underscore when registering with the
> HWMON framework. Other forbidden characters (star, slash, space, tab,
> newline) are not replaced, as they are not in common use.
>
> Fixes: e67d4dfc9ff1 ("power: supply: Add HWMON compatibility layer")
> Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
> ---
> drivers/power/supply/power_supply_hwmon.c | 15 ++++++++++++++-
> 1 file changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c
> index 51fe60440d12..ebe964bd512c 100644
> --- a/drivers/power/supply/power_supply_hwmon.c
> +++ b/drivers/power/supply/power_supply_hwmon.c
> @@ -284,6 +284,7 @@ int power_supply_add_hwmon_sysfs(struct power_supply *psy)
> struct device *dev = &psy->dev;
> struct device *hwmon;
> int ret, i;
> + const char *name;
>
> if (!devres_open_group(dev, power_supply_add_hwmon_sysfs,
> GFP_KERNEL))
> @@ -334,7 +335,19 @@ int power_supply_add_hwmon_sysfs(struct power_supply *psy)
> }
> }
>
> - hwmon = devm_hwmon_device_register_with_info(dev, psy->desc->name,
> + name = psy->desc->name;
> + if (strchr(name, '-')) {
> + char *new_name;
> +
> + new_name = devm_kstrdup(dev, name, GFP_KERNEL);
> + if (!new_name) {
> + ret = -ENOMEM;
> + goto error;
> + }
> + strreplace(new_name, '-', '_');
> + name = (const char *) new_name;
Is that typecast necessary ?
Other than that,
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> + }
> + hwmon = devm_hwmon_device_register_with_info(dev, name,
> psyhw,
> &power_supply_hwmon_chip_info,
> NULL);
> --
> 2.17.1
>
next prev parent reply other threads:[~2019-08-22 16:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-22 15:09 [PATCH] power: supply: register HWMON devices with valid names Romain Izard
2019-08-22 16:12 ` Guenter Roeck [this message]
2019-08-23 9:03 ` Romain Izard
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=20190822161207.GB6992@roeck-us.net \
--to=linux@roeck-us.net \
--cc=andrew.smirnov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=romain.izard.pro@gmail.com \
--cc=sre@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).