From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: daniel.lezcano@linaro.org, rui.zhang@intel.com
Cc: amitk@kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH 4/4] thermal/core: Remove ms based delay fields
Date: Wed, 2 Dec 2020 13:06:57 +0100 [thread overview]
Message-ID: <20201202120657.1969-4-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20201202120657.1969-1-daniel.lezcano@linaro.org>
The code does no longer use the ms unit based fields to set the
delays as they are replaced by the jiffies.
Remove them.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/thermal/thermal_core.h | 2 --
drivers/thermal/thermal_sysfs.c | 2 +-
include/linux/thermal.h | 7 -------
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index 2c9551ed5ef8..5baa308ee7a5 100644
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -131,7 +131,6 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz);
static inline void thermal_zone_set_passive_delay(
struct thermal_zone_device *tz, int delay_ms)
{
- tz->passive_delay_ms = delay_ms;
tz->passive_delay_jiffies = msecs_to_jiffies(delay_ms);
if (delay_ms > 1000)
tz->passive_delay_jiffies = round_jiffies(tz->passive_delay_jiffies);
@@ -140,7 +139,6 @@ static inline void thermal_zone_set_passive_delay(
static inline void thermal_zone_set_polling_delay(
struct thermal_zone_device *tz, int delay_ms)
{
- tz->polling_delay_ms = delay_ms;
tz->polling_delay_jiffies = msecs_to_jiffies(delay_ms);
if (delay_ms > 1000)
tz->polling_delay_jiffies = round_jiffies(tz->polling_delay_jiffies);
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 9598b288a0a1..8532b1dd0608 100644
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -233,7 +233,7 @@ passive_store(struct device *dev, struct device_attribute *attr,
return -EINVAL;
if (state && !tz->forced_passive) {
- if (!tz->passive_delay_ms)
+ if (!tz->passive_delay_jiffies)
thermal_zone_set_passive_delay(tz, 1000);
thermal_zone_device_rebind_exception(tz, "Processor",
sizeof("Processor"));
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 5dd9bdb6c6ad..f23a388ded15 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -116,13 +116,8 @@ struct thermal_cooling_device {
* @devdata: private pointer for device private data
* @trips: number of trip points the thermal zone supports
* @trips_disabled; bitmap for disabled trips
- * @passive_delay_ms: number of milliseconds to wait between polls when
- * performing passive cooling.
* @passive_delay_jiffies: number of jiffies to wait between polls when
* performing passive cooling.
- * @polling_delay_ms: number of milliseconds to wait between polls when
- * checking whether trip points have been crossed (0 for
- * interrupt driven systems)
* @polling_delay_jiffies: number of jiffies to wait between polls when
* checking whether trip points have been crossed (0 for
* interrupt driven systems)
@@ -164,8 +159,6 @@ struct thermal_zone_device {
void *devdata;
int trips;
unsigned long trips_disabled; /* bitmap for disabled trips */
- int passive_delay_ms;
- int polling_delay_ms;
int passive_delay_jiffies;
int polling_delay_jiffies;
int temperature;
--
2.17.1
next prev parent reply other threads:[~2020-12-02 12:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-02 12:06 [PATCH 1/4] thermal/core: Rename passive_delay and polling_delay with units Daniel Lezcano
2020-12-02 12:06 ` [PATCH 2/4] thermal/core: Precompute the jiffies Daniel Lezcano
2020-12-15 14:38 ` Thara Gopinath
2020-12-15 22:58 ` Daniel Lezcano
2020-12-02 12:06 ` [PATCH 3/4] thermal/core: Use precomputed jiffies for the polling Daniel Lezcano
2020-12-02 12:06 ` Daniel Lezcano [this message]
2020-12-02 17:26 ` [PATCH 4/4] thermal/core: Remove ms based delay fields kernel test robot
2020-12-02 17:44 ` kernel test robot
2020-12-02 15:18 ` [PATCH 1/4] thermal/core: Rename passive_delay and polling_delay with units kernel test robot
2020-12-02 16:14 ` kernel test robot
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=20201202120657.1969-4-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=amitk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.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).