All of lore.kernel.org
 help / color / mirror / Atom feed
From: marek.vasut@gmail.com
To: linux-pm@vger.kernel.org
Cc: linux-renesas-soc@vger.kernel.org,
	Marek Vasut <marek.vasut@gmail.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Eduardo Valentin <edubezval@gmail.com>,
	Wolfram Sang <wsa+renesas@sang-engineering.com>,
	Zhang Rui <rui.zhang@intel.com>,
	Marek Vasut <marek.vasut+renesas@gmail.com>
Subject: [PATCH V3 3/6] thermal: Register hwmon in thermal_zone_of_sensor_register_param()
Date: Mon, 17 Dec 2018 16:56:41 +0100	[thread overview]
Message-ID: <20181217155644.29278-4-marek.vasut@gmail.com> (raw)
In-Reply-To: <20181217155644.29278-1-marek.vasut@gmail.com>

From: Marek Vasut <marek.vasut@gmail.com>

Register hwmon sysfs interface in thermal_zone_of_sensor_register_param()
in case thermal_zone_params->no_hwmon is set to false. This behavior is
the same as thermal_zone_device_register().

From: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-renesas-soc@vger.kernel.org
To: linux-pm@vger.kernel.org
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
---
V2: No change
V3: - Work around the From line and SoB line checkpatch warning
    - Reorder the SoB line at the end
---
 drivers/thermal/of-thermal.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
index e1a303a5698c..5ccff7b678de 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -15,6 +15,7 @@
 #include <linux/string.h>
 
 #include "thermal_core.h"
+#include "thermal_hwmon.h"
 
 /***   Private data structures to represent thermal device tree data ***/
 
@@ -521,8 +522,15 @@ thermal_zone_of_sensor_register_params(struct device *dev, int sensor_id,
 		if (sensor_specs.np == sensor_np && id == sensor_id) {
 			tzd = thermal_zone_of_add_sensor(child, sensor_np,
 							 data, ops);
-			if (!IS_ERR(tzd))
+			if (!IS_ERR(tzd)) {
+				tzd->tzp = tzp;
 				tzd->ops->set_mode(tzd, THERMAL_DEVICE_ENABLED);
+				if (!tzp || !tzp->no_hwmon) {
+					ret = thermal_add_hwmon_sysfs(tzd);
+					if (ret)
+						tzd = ERR_PTR(ret);
+				}
+			}
 
 			of_node_put(sensor_specs.np);
 			of_node_put(child);
@@ -605,6 +613,8 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
 
 	tz = tzd->devdata;
 
+	thermal_remove_hwmon_sysfs(tzd);
+
 	/* no __thermal_zone, nothing to be done */
 	if (!tz)
 		return;
-- 
2.18.0


  parent reply	other threads:[~2018-12-17 15:56 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-17 15:56 [PATCH V3 0/6] thermal: Align devm_thermal_zone_{device,of_sensor}_register marek.vasut
2018-12-17 15:56 ` [PATCH V3 1/6] thermal: split thermal_zone_of_sensor_register{,_param}() marek.vasut
2018-12-18 11:04   ` Simon Horman
2018-12-17 15:56 ` [PATCH V3 2/6] thermal: split devm_thermal_zone_of_sensor_register{,_param}() marek.vasut
2018-12-18 11:04   ` Simon Horman
2018-12-17 15:56 ` marek.vasut [this message]
2018-12-17 18:12   ` [PATCH V3 3/6] thermal: Register hwmon in thermal_zone_of_sensor_register_param() Wolfram Sang
2018-12-22  2:16     ` Marek Vasut
2018-12-18 11:04   ` Simon Horman
2018-12-18 21:44   ` Eduardo Valentin
2018-12-22  2:19     ` Marek Vasut
2019-01-15  0:35       ` Marek Vasut
2019-01-28 12:10         ` Marek Vasut
2019-02-05 23:24           ` Eduardo Valentin
2019-02-11 19:29             ` Marek Vasut
2019-02-12  8:52               ` Geert Uytterhoeven
2019-02-12 16:12                 ` Guenter Roeck
2018-12-17 15:56 ` [PATCH V3 4/6] thermal: stm32: Convert to devm_thermal_zone_of_sensor_register_params() marek.vasut
2018-12-18 11:05   ` Simon Horman
2018-12-17 15:56 ` [PATCH V3 5/6] thermal: rcar_thermal: " marek.vasut
2018-12-18 11:05   ` Simon Horman
2018-12-19 23:25     ` Marek Vasut
2018-12-20  7:46       ` Simon Horman
2018-12-20 23:13         ` Marek Vasut
2018-12-17 15:56 ` [PATCH V3 6/6] thermal: rcar_gen3_thermal: Register hwmon sysfs interface marek.vasut
2018-12-18 11:06   ` Simon Horman

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=20181217155644.29278-4-marek.vasut@gmail.com \
    --to=marek.vasut@gmail.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=edubezval@gmail.com \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=marek.vasut+renesas@gmail.com \
    --cc=rui.zhang@intel.com \
    --cc=wsa+renesas@sang-engineering.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.