linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: Sebastian Reichel <sebastian.reichel@collabora.com>,
	Andrey Smirnov <andrew.smirnov@gmail.com>,
	Guenter Roeck <linux@roeck-us.net>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/7] power: supply: core: fix HWMON temperature labels
Date: Thu, 02 Apr 2020 16:57:02 +0200	[thread overview]
Message-ID: <4a8ac6700e1503a69146f3eefd7cb515d11bfc9f.1585837575.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <cover.1585837575.git.mirq-linux@rere.qmqm.pl>

tempX_label files are swapped compared to what
power_supply_hwmon_temp_to_property() uses. Make them match.
While at it, make room for labeling other channels.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/power/supply/power_supply_hwmon.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/power/supply/power_supply_hwmon.c b/drivers/power/supply/power_supply_hwmon.c
index 75cf861ba492..83318a21fb52 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,7 +149,14 @@ static int power_supply_hwmon_read_string(struct device *dev,
 					  u32 attr, int channel,
 					  const char **str)
 {
-	*str = channel ? "temp" : "temp ambient";
+	switch (type) {
+	case hwmon_temp:
+		*str = ps_temp_label[channel];
+		break;
+	default:
+		break;
+	}
+
 	return 0;
 }
 
-- 
2.20.1


  parent reply	other threads:[~2020-04-02 14:57 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-02 14:57 [PATCH 0/7] power: supply: core: extensions and fixes Michał Mirosław
2020-04-02 14:57 ` [PATCH 1/7] power: supply: core: reduce power_supply_show_usb_type() parameters Michał Mirosław
2020-04-02 14:57 ` [PATCH 2/7] power: supply: core: allow to constify property lists Michał Mirosław
2020-04-03 19:16   ` kbuild test robot
2020-04-03 19:52   ` kbuild test robot
2020-04-02 14:57 ` Michał Mirosław [this message]
2020-04-02 14:52   ` [PATCH 3/7] power: supply: core: fix HWMON temperature labels Guenter Roeck
2020-04-02 15:00     ` Michał Mirosław
2020-04-02 18:29       ` Guenter Roeck
2020-04-03 15:53         ` Michał Mirosław
2020-04-02 14:57 ` [PATCH 4/7] power: supply: core: hide unused HWMON labels Michał Mirosław
2020-04-02 14:57 ` [PATCH 5/7] power: supply: core: add input voltage/current measurements Michał Mirosław
2020-04-02 14:57 ` [PATCH 6/7] power: supply: core: add output voltage measurements Michał Mirosław
2020-04-02 14:57 ` [PATCH 7/7] 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=4a8ac6700e1503a69146f3eefd7cb515d11bfc9f.1585837575.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 \
    --subject='Re: [PATCH 3/7] power: supply: core: fix HWMON temperature labels' \
    /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

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox