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 5/6] thermal: rcar_thermal: Convert to devm_thermal_zone_of_sensor_register_params()
Date: Mon, 17 Dec 2018 16:56:43 +0100 [thread overview]
Message-ID: <20181217155644.29278-6-marek.vasut@gmail.com> (raw)
In-Reply-To: <20181217155644.29278-1-marek.vasut@gmail.com>
From: Marek Vasut <marek.vasut@gmail.com>
Convert the rcar code to devm_thermal_zone_of_sensor_register_params(),
no functional change.
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/rcar_thermal.c | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 8014a207d8d9..ec70c2119c77 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -19,8 +19,6 @@
#include <linux/spinlock.h>
#include <linux/thermal.h>
-#include "thermal_hwmon.h"
-
#define IDLE_INTERVAL 5000
#define COMMON_STR 0x00
@@ -54,6 +52,10 @@ struct rcar_thermal_chip {
unsigned int nirqs;
};
+static struct thermal_zone_params rcar_thermal_params = {
+ .no_hwmon = false,
+};
+
static const struct rcar_thermal_chip rcar_thermal = {
.use_of_thermal = 0,
.has_filonoff = 1,
@@ -458,9 +460,7 @@ static int rcar_thermal_remove(struct platform_device *pdev)
rcar_thermal_for_each_priv(priv, common) {
rcar_thermal_irq_disable(priv);
cancel_delayed_work_sync(&priv->work);
- if (priv->chip->use_of_thermal)
- thermal_remove_hwmon_sysfs(priv->zone);
- else
+ if (!priv->chip->use_of_thermal)
thermal_zone_device_unregister(priv->zone);
}
@@ -554,16 +554,20 @@ static int rcar_thermal_probe(struct platform_device *pdev)
if (ret < 0)
goto error_unregister;
- if (chip->use_of_thermal)
- priv->zone = devm_thermal_zone_of_sensor_register(
+ if (chip->use_of_thermal) {
+ priv->zone =
+ devm_thermal_zone_of_sensor_register_params(
dev, i, priv,
- &rcar_thermal_zone_of_ops);
- else
+ &rcar_thermal_zone_of_ops,
+ &rcar_thermal_params);
+ } else {
priv->zone = thermal_zone_device_register(
"rcar_thermal",
1, 0, priv,
&rcar_thermal_zone_ops, NULL, 0,
idle);
+ }
+
if (IS_ERR(priv->zone)) {
dev_err(dev, "can't register thermal zone\n");
ret = PTR_ERR(priv->zone);
@@ -571,17 +575,6 @@ static int rcar_thermal_probe(struct platform_device *pdev)
goto error_unregister;
}
- if (chip->use_of_thermal) {
- /*
- * thermal_zone doesn't enable hwmon as default,
- * but, enable it here to keep compatible
- */
- priv->zone->tzp->no_hwmon = false;
- ret = thermal_add_hwmon_sysfs(priv->zone);
- if (ret)
- goto error_unregister;
- }
-
rcar_thermal_irq_enable(priv);
list_move_tail(&priv->list, &common->head);
--
2.18.0
next prev parent reply other threads:[~2018-12-17 15:57 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 ` [PATCH V3 3/6] thermal: Register hwmon in thermal_zone_of_sensor_register_param() marek.vasut
2018-12-17 18:12 ` 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 ` marek.vasut [this message]
2018-12-18 11:05 ` [PATCH V3 5/6] thermal: rcar_thermal: " 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-6-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 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).