From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
To: Zhang Rui <rui.zhang@intel.com>, Eduardo Valentin <edubezval@gmail.com>
Cc: Eric Anholt <eric@anholt.net>,
Stefan Wahren <stefan.wahren@i2se.com>,
Markus Mayer <mmayer@broadcom.com>,
bcm-kernel-feedback-list@broadcom.com,
Heiko Stuebner <heiko@sntech.de>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Keerthy <j-keerthy@ti.com>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Jun Nie <jun.nie@linaro.org>, Baoyou Xie <baoyou.xie@linaro.org>,
Shawn Guo <shawnguo@kernel.org>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
b.zolnierkie@samsung.com
Subject: [PATCH 01/17] thermal: add thermal_zone_device_toggle() helper
Date: Tue, 10 Apr 2018 14:41:55 +0200 [thread overview]
Message-ID: <1523364131-31059-2-git-send-email-b.zolnierkie@samsung.com> (raw)
In-Reply-To: <1523364131-31059-1-git-send-email-b.zolnierkie@samsung.com>
Add thermal_zone_device_toggle() helper. Then update core code and
drivers to use it.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---
drivers/thermal/hisi_thermal.c | 14 ++------------
drivers/thermal/of-thermal.c | 2 +-
drivers/thermal/rockchip_thermal.c | 22 +++++-----------------
drivers/thermal/thermal_helpers.c | 15 +++++++++++++++
drivers/thermal/thermal_sysfs.c | 8 +++++---
include/linux/thermal.h | 1 +
6 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index 761d055..9428499 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -515,15 +515,6 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
};
MODULE_DEVICE_TABLE(of, of_hisi_thermal_match);
-static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor,
- bool on)
-{
- struct thermal_zone_device *tzd = sensor->tzd;
-
- tzd->ops->set_mode(tzd,
- on ? THERMAL_DEVICE_ENABLED : THERMAL_DEVICE_DISABLED);
-}
-
static int hisi_thermal_probe(struct platform_device *pdev)
{
struct hisi_thermal_data *data;
@@ -571,7 +562,7 @@ static int hisi_thermal_probe(struct platform_device *pdev)
}
}
- hisi_thermal_toggle_sensor(&data->sensor, true);
+ thermal_zone_device_toggle((&data->sensor)->tzd, true);
return 0;
}
@@ -579,9 +570,8 @@ static int hisi_thermal_probe(struct platform_device *pdev)
static int hisi_thermal_remove(struct platform_device *pdev)
{
struct hisi_thermal_data *data = platform_get_drvdata(pdev);
- struct hisi_thermal_sensor *sensor = &data->sensor;
- hisi_thermal_toggle_sensor(sensor, false);
+ thermal_zone_device_toggle((&data->sensor)->tzd, false);
data->disable_sensor(data);
diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
index e09f035..f138b78 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -510,7 +510,7 @@ struct thermal_zone_device *
tzd = thermal_zone_of_add_sensor(child, sensor_np,
data, ops);
if (!IS_ERR(tzd))
- tzd->ops->set_mode(tzd, THERMAL_DEVICE_ENABLED);
+ thermal_zone_device_toggle(tzd, true);
of_node_put(sensor_specs.np);
of_node_put(child);
diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index f36375d..c191e41 100644
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -1022,15 +1022,6 @@ static void rk_tsadcv2_tshut_mode(int chn, void __iomem *regs,
};
MODULE_DEVICE_TABLE(of, of_rockchip_thermal_match);
-static void
-rockchip_thermal_toggle_sensor(struct rockchip_thermal_sensor *sensor, bool on)
-{
- struct thermal_zone_device *tzd = sensor->tzd;
-
- tzd->ops->set_mode(tzd,
- on ? THERMAL_DEVICE_ENABLED : THERMAL_DEVICE_DISABLED);
-}
-
static irqreturn_t rockchip_thermal_alarm_irq_thread(int irq, void *dev)
{
struct rockchip_thermal_data *thermal = dev;
@@ -1292,7 +1283,7 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
thermal->chip->control(thermal->regs, true);
for (i = 0; i < thermal->chip->chn_num; i++)
- rockchip_thermal_toggle_sensor(&thermal->sensors[i], true);
+ thermal_zone_device_toggle((&thermal->sensors[i])->tzd, true);
platform_set_drvdata(pdev, thermal);
@@ -1311,11 +1302,8 @@ static int rockchip_thermal_remove(struct platform_device *pdev)
struct rockchip_thermal_data *thermal = platform_get_drvdata(pdev);
int i;
- for (i = 0; i < thermal->chip->chn_num; i++) {
- struct rockchip_thermal_sensor *sensor = &thermal->sensors[i];
-
- rockchip_thermal_toggle_sensor(sensor, false);
- }
+ for (i = 0; i < thermal->chip->chn_num; i++)
+ thermal_zone_device_toggle((&thermal->sensors[i])->tzd, false);
thermal->chip->control(thermal->regs, false);
@@ -1332,7 +1320,7 @@ static int __maybe_unused rockchip_thermal_suspend(struct device *dev)
int i;
for (i = 0; i < thermal->chip->chn_num; i++)
- rockchip_thermal_toggle_sensor(&thermal->sensors[i], false);
+ thermal_zone_device_toggle((&thermal->sensors[i])->tzd, false);
thermal->chip->control(thermal->regs, false);
@@ -1383,7 +1371,7 @@ static int __maybe_unused rockchip_thermal_resume(struct device *dev)
thermal->chip->control(thermal->regs, true);
for (i = 0; i < thermal->chip->chn_num; i++)
- rockchip_thermal_toggle_sensor(&thermal->sensors[i], true);
+ thermal_zone_device_toggle((&thermal->sensors[i])->tzd, true);
pinctrl_pm_select_default_state(dev);
diff --git a/drivers/thermal/thermal_helpers.c b/drivers/thermal/thermal_helpers.c
index eb03d7e..d5db101 100644
--- a/drivers/thermal/thermal_helpers.c
+++ b/drivers/thermal/thermal_helpers.c
@@ -227,3 +227,18 @@ int thermal_zone_get_offset(struct thermal_zone_device *tz)
return 0;
}
EXPORT_SYMBOL_GPL(thermal_zone_get_offset);
+
+/**
+ * thermal_zone_device_toggle() - enables/disables thermal zone device
+ * @tz: a valid pointer to a struct thermal_zone_device
+ *
+ * Enables/Disables thermal zone device.
+ *
+ * Return: On success returns 0, an error code otherwise.
+ */
+int thermal_zone_device_toggle(struct thermal_zone_device *tz, bool on)
+{
+ return tz->ops->set_mode(tz,
+ on ? THERMAL_DEVICE_ENABLED : THERMAL_DEVICE_DISABLED);
+}
+EXPORT_SYMBOL_GPL(thermal_zone_device_toggle);
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 23b5e0a..343f52b 100644
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -72,17 +72,19 @@
{
struct thermal_zone_device *tz = to_thermal_zone(dev);
int result;
+ bool on;
if (!tz->ops->set_mode)
return -EPERM;
if (!strncmp(buf, "enabled", sizeof("enabled") - 1))
- result = tz->ops->set_mode(tz, THERMAL_DEVICE_ENABLED);
+ on = true;
else if (!strncmp(buf, "disabled", sizeof("disabled") - 1))
- result = tz->ops->set_mode(tz, THERMAL_DEVICE_DISABLED);
+ on = false;
else
- result = -EINVAL;
+ return -EINVAL;
+ result = thermal_zone_device_toggle(tz, on);
if (result)
return result;
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 7834be6..4fbbabe 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -467,6 +467,7 @@ struct thermal_cooling_device *
int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);
int thermal_zone_get_slope(struct thermal_zone_device *tz);
int thermal_zone_get_offset(struct thermal_zone_device *tz);
+int thermal_zone_device_toggle(struct thermal_zone_device *tz, bool on);
int get_tz_trend(struct thermal_zone_device *, int);
struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,
--
1.9.1
next prev parent reply other threads:[~2018-04-10 12:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20180410124240epcas2p25c8979583c41f147ac34c49faf30aa14@epcas2p2.samsung.com>
2018-04-10 12:41 ` [PATCH 00/17] thermal: enable/check sensor after its setup is finished Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124248epcas1p453f74df4e183f9d68de255847c093d4e@epcas1p4.samsung.com>
2018-04-10 12:41 ` Bartlomiej Zolnierkiewicz [this message]
2018-09-10 17:16 ` [PATCH 01/17] thermal: add thermal_zone_device_toggle() helper Eduardo Valentin
2018-09-14 11:40 ` Bartlomiej Zolnierkiewicz
[not found] ` <0495124b-9ae8-3b4b-5f0c-208d2e06e5a5@samsung.com>
2018-09-17 9:33 ` Bartlomiej Zolnierkiewicz
2018-09-24 16:46 ` Eduardo Valentin
[not found] ` <CGME20180410124301epcas1p1ec12971677961efaf55500f743af6a7c@epcas1p1.samsung.com>
2018-04-10 12:41 ` [PATCH 02/17] thermal: separate sensor registration and enable Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124310epcas2p4082a61fa96384a9a88c7cfef3ef18675@epcas2p4.samsung.com>
2018-04-10 12:41 ` [PATCH 03/17] thermal: add thermal_zone_device_check() helper Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124321epcas2p3b69098cf09147bb4751d5c035ad506bb@epcas2p3.samsung.com>
2018-04-10 12:41 ` [PATCH 04/17] thermal: do sensor checking explicitly in drivers Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124327epcas2p1da6a39c2e0443b5b5ec575941f6255a7@epcas2p1.samsung.com>
2018-04-10 12:41 ` [PATCH 05/17] thermal: bcm2835: enable/check sensor after its setup is finished Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124333epcas2p2491f24a23bc90b06dd7cf46bd469babd@epcas2p2.samsung.com>
2018-04-10 12:42 ` [PATCH 06/17] thermal: brcmstb: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124339epcas2p31bdbdc3d5fc602b3c7fe60b02e8faacd@epcas2p3.samsung.com>
2018-04-10 12:42 ` [PATCH 07/17] thermal: hisi_thermal: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124348epcas2p3ca37509a4054ba323bc40080b86b842c@epcas2p3.samsung.com>
2018-04-10 12:42 ` [PATCH 08/17] thermal: qcom: tsens: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124355epcas2p272d4a06619ad3a3e58c792186069f0bc@epcas2p2.samsung.com>
2018-04-10 12:42 ` [PATCH 09/17] thermal: qoriq: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124402epcas2p25249fff958ca0f54094d43275ffa47a7@epcas2p2.samsung.com>
2018-04-10 12:42 ` [PATCH 10/17] thermal: rcar_gen3_thermal: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124407epcas2p4c537eb52653af45b85af6b69969c4e52@epcas2p4.samsung.com>
2018-04-10 12:42 ` [PATCH 11/17] thermal: rockchip_thermal: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124416epcas1p284cf4e47c0231f764ed81efcee7c0e14@epcas1p2.samsung.com>
2018-04-10 12:42 ` [PATCH 12/17] thermal: exynos: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124427epcas1p371389bc9fdfa2f1582950b68a9121caf@epcas1p3.samsung.com>
2018-04-10 12:42 ` [PATCH 13/17] thermal: tegra: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124436epcas1p3422f3653277634b8cc8bef223bc9298f@epcas1p3.samsung.com>
2018-04-10 12:42 ` [PATCH 14/17] thermal: ti-soc-thermal: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124442epcas1p1b9d69f57eb25cc4dc69ebd7e85479036@epcas1p1.samsung.com>
2018-04-10 12:42 ` [PATCH 15/17] thermal: uniphier: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124449epcas1p2dd40472146b417f7cb2d2bfdaea232ba@epcas1p2.samsung.com>
2018-04-10 12:42 ` [PATCH 16/17] thermal: zx2967: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180410124457epcas1p33e959cf61c2a7f54227e29ef5ba9b0eb@epcas1p3.samsung.com>
2018-04-10 12:42 ` [PATCH 17/17] thermal: warn on attempts to read temperature on disabled sensors Bartlomiej Zolnierkiewicz
2018-04-18 22:26 ` [PATCH 00/17] thermal: enable/check sensor after its setup is finished Stefan Wahren
2018-06-29 16:15 ` Bartlomiej Zolnierkiewicz
2018-09-07 9:10 ` Amit Kucheria
2018-09-10 17:37 ` Eduardo Valentin
2018-09-14 13:17 ` Bartlomiej Zolnierkiewicz
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=1523364131-31059-2-git-send-email-b.zolnierkie@samsung.com \
--to=b.zolnierkie@samsung.com \
--cc=baoyou.xie@linaro.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=edubezval@gmail.com \
--cc=eric@anholt.net \
--cc=heiko@sntech.de \
--cc=j-keerthy@ti.com \
--cc=jonathanh@nvidia.com \
--cc=jun.nie@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mmayer@broadcom.com \
--cc=rui.zhang@intel.com \
--cc=shawnguo@kernel.org \
--cc=stefan.wahren@i2se.com \
--cc=thierry.reding@gmail.com \
--cc=yamada.masahiro@socionext.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).