From: Guenter Roeck <linux@roeck-us.net>
To: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
"Andrey Smirnov" <andrew.smirnov@gmail.com>,
"Sebastian Reichel" <sebastian.reichel@collabora.com>
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH v2 4/8] power: supply: core: tabularize HWMON temperature labels
Date: Fri, 3 Apr 2020 09:47:40 -0700 [thread overview]
Message-ID: <dad5d544-7f6d-5c0d-6c6e-9d23cb0a6055@roeck-us.net> (raw)
In-Reply-To: <ae82abf9da86542f5657a8c37106bcdae5011927.1585929579.git.mirq-linux@rere.qmqm.pl>
On 4/3/20 9:23 AM, Michał Mirosław wrote:
> Rework power_supply_hwmon_read_string() to check it's parameters.
> This allows to extend it later with labels for other types of
> measurements.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> ---
> v2: split from fix temperature labels
> ---
> drivers/power/supply/power_supply_hwmon.c | 21 +++++++++++++++++++--
> 1 file changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c
> index 67b6ee60085e..48c73994732c 100644
> --- a/drivers/power/supply/power_supply_hwmon.c
> +++ b/drivers/power/supply/power_supply_hwmon.c
> @@ -43,6 +43,11 @@ static int power_supply_hwmon_curr_to_property(u32 attr)
> }
> }
>
> +static const char *const ps_temp_label[] = {
> + "temp",
> + "ambient temp",
> +};
> +
> static int power_supply_hwmon_temp_to_property(u32 attr, int channel)
> {
> if (channel) {
> @@ -144,8 +149,20 @@ static int power_supply_hwmon_read_string(struct device *dev,
> u32 attr, int channel,
> const char **str)
> {
> - *str = channel ? "temp ambient" : "temp";
> - return 0;
> + if (channel < 0)
> + return -EINVAL;
> +
This is unnecessary.
> + switch (type) {
> + case hwmon_temp:
> + if (channel >= ARRAY_SIZE(ps_temp_label))
> + return -EINVAL;
As is this. We don't usually check boundaries like this for
in-kernel APIs, and I personally would not want to have it
introduced in the kernel more than necessary. This just increases
kernel image size with zero benefit.
Guenter
> + *str = ps_temp_label[channel];
> + return 0;
> + default:
> + break;
> + }
> +
> + return -EINVAL;
> }
>
> static int
>
next prev parent reply other threads:[~2020-04-03 16:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 16:23 [PATCH v2 0/8] power: supply: core: extensions and fixes Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 1/8] power: supply: core: reduce power_supply_show_usb_type() parameters Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 2/8] power: supply: core: allow to constify property lists Michał Mirosław
2020-04-10 20:41 ` kbuild test robot
2020-04-10 22:14 ` kbuild test robot
2020-04-03 16:23 ` [PATCH v2 3/8] power: supply: core: fix HWMON temperature labels Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 5/8] power: supply: core: hide unused HWMON labels Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 4/8] power: supply: core: tabularize HWMON temperature labels Michał Mirosław
2020-04-03 16:47 ` Guenter Roeck [this message]
2020-04-03 16:56 ` Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 7/8] power: supply: core: add output voltage measurements Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 6/8] power: supply: core: add input voltage/current measurements Michał Mirosław
2020-04-03 16:23 ` [PATCH v2 8/8] power: supply: core: document measurement points Michał Mirosław
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=dad5d544-7f6d-5c0d-6c6e-9d23cb0a6055@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=mirq-linux@rere.qmqm.pl \
--cc=sebastian.reichel@collabora.com \
/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).