From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: Andrey Smirnov <andrew.smirnov@gmail.com>,
Guenter Roeck <linux@roeck-us.net>,
Sebastian Reichel <sebastian.reichel@collabora.com>
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH v3 08/11] power: supply: core: hide unused HWMON labels
Date: Fri, 03 Apr 2020 22:20:34 +0200 [thread overview]
Message-ID: <7ac1176497a246b59316efecef9912dcf9b1e48a.1585944770.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <cover.1585944770.git.mirq-linux@rere.qmqm.pl>
Currently HWMON emulation shows all labels (temp and ambient temp)
regardless if power supply supports reading the values. Check that at
least one property is enabled for each label.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
v3: use a tabule for type checking instead of switch() sequence
---
drivers/power/supply/power_supply_hwmon.c | 42 +++++++++++++++++++++--
1 file changed, 39 insertions(+), 3 deletions(-)
diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c
index 5621e72a39f0..1b473deaf391 100644
--- a/drivers/power/supply/power_supply_hwmon.c
+++ b/drivers/power/supply/power_supply_hwmon.c
@@ -103,6 +103,39 @@ static bool power_supply_hwmon_is_a_label(enum hwmon_sensor_types type,
return type == hwmon_temp && attr == hwmon_temp_label;
}
+struct hwmon_type_attr_list {
+ const u32 *attrs;
+ size_t n_attrs;
+};
+
+static const u32 ps_temp_attrs[] = {
+ hwmon_temp_input,
+ hwmon_temp_min, hwmon_temp_max,
+ hwmon_temp_min_alarm, hwmon_temp_max_alarm,
+};
+
+static const struct hwmon_type_attr_list ps_type_attrs[hwmon_max] = {
+ [hwmon_temp] = { ps_temp_attrs, ARRAY_SIZE(ps_temp_attrs) },
+};
+
+static bool power_supply_hwmon_has_input(
+ const struct power_supply_hwmon *psyhw,
+ enum hwmon_sensor_types type, int channel)
+{
+ const struct hwmon_type_attr_list *attr_list = &ps_type_attrs[type];
+ size_t i;
+
+ for (i = 0; i < attr_list->n_attrs; ++i) {
+ int prop = power_supply_hwmon_to_property(type,
+ attr_list->attrs[i], channel);
+
+ if (prop >= 0 && test_bit(prop, psyhw->props))
+ return true;
+ }
+
+ return false;
+}
+
static bool power_supply_hwmon_is_writable(enum hwmon_sensor_types type,
u32 attr)
{
@@ -129,9 +162,12 @@ static umode_t power_supply_hwmon_is_visible(const void *data,
const struct power_supply_hwmon *psyhw = data;
int prop;
-
- if (power_supply_hwmon_is_a_label(type, attr))
- return 0444;
+ if (power_supply_hwmon_is_a_label(type, attr)) {
+ if (power_supply_hwmon_has_input(psyhw, type, channel))
+ return 0444;
+ else
+ return 0;
+ }
prop = power_supply_hwmon_to_property(type, attr, channel);
if (prop < 0 || !test_bit(prop, psyhw->props))
--
2.20.1
next prev parent reply other threads:[~2020-04-03 20:20 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 20:20 [PATCH v3 00/11] extensions and fixes Michał Mirosław
2020-04-03 20:20 ` [PATCH v3 01/11] power: charger-manager: remove duplicate assignment Michał Mirosław
2020-04-03 20:20 ` [PATCH v3 03/11] power: generic-adc-battery: fold psy_props[] to private data Michał Mirosław
2020-04-03 20:20 ` [PATCH v3 02/11] power: charger-manager: don't write through desc->properties Michał Mirosław
2020-05-01 12:38 ` Sebastian Reichel
2020-05-01 13:30 ` Michał Mirosław
2020-05-01 13:39 ` [PATCH] power: charger-manager: fix adding of optional properties Michał Mirosław
2020-05-01 13:51 ` Sebastian Reichel
2020-05-01 14:15 ` Michał Mirosław
2020-05-01 14:30 ` [PATCH] power: charger-manager: clarify num_properties starting value Michał Mirosław
2020-05-01 14:58 ` Sebastian Reichel
2020-05-01 13:48 ` [PATCH v3 02/11] power: charger-manager: don't write through desc->properties Sebastian Reichel
2020-04-03 20:20 ` [PATCH v3 05/11] power: supply: core: allow to constify property lists Michał Mirosław
2020-05-01 12:36 ` Sebastian Reichel
2020-04-03 20:20 ` [PATCH v3 04/11] power: supply: core: reduce power_supply_show_usb_type() parameters Michał Mirosław
2020-05-01 12:36 ` Sebastian Reichel
2020-04-03 20:20 ` [PATCH v3 06/11] power: supply: core: fix HWMON temperature labels Michał Mirosław
2020-05-01 12:39 ` Sebastian Reichel
2020-04-03 20:20 ` [PATCH v3 07/11] power: supply: core: tabularize " Michał Mirosław
2020-04-05 1:52 ` kbuild test robot
2020-04-07 18:13 ` Nick Desaulniers
2020-04-07 19:55 ` Michał Mirosław
2020-04-07 19:57 ` Nick Desaulniers
2020-04-07 22:31 ` Nick Desaulniers
2020-04-20 9:22 ` Michał Mirosław
2020-05-01 12:47 ` Sebastian Reichel
2020-04-03 20:20 ` Michał Mirosław [this message]
2020-05-01 13:22 ` [PATCH v3 08/11] power: supply: core: hide unused HWMON labels Sebastian Reichel
2020-04-03 20:20 ` [PATCH v3 09/11] power: supply: core: add input voltage/current measurements Michał Mirosław
2020-04-03 20:20 ` [PATCH v3 10/11] power: supply: core: add output voltage measurements Michał Mirosław
2020-04-03 20:20 ` [PATCH v3 11/11] 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=7ac1176497a246b59316efecef9912dcf9b1e48a.1585944770.git.mirq-linux@rere.qmqm.pl \
--to=mirq-linux@rere.qmqm.pl \
--cc=andrew.smirnov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@roeck-us.net \
--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).