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.lezc...@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
