| Message ID | 20201207190902.30464-3-daniel.lezcano@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Zhang Rui |
| Headers | show |
| Series | [v2,1/4] thermal/core: Rename passive_delay and polling_delay with units | expand |
On 12/7/20 7:09 PM, Daniel Lezcano wrote: > The delays are also stored in jiffies based unit. Use them instead of > the ms. > > Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > --- > drivers/thermal/thermal_core.c | 13 ++++--------- > 1 file changed, 4 insertions(+), 9 deletions(-) > > diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c > index 08c6e4e36896..16ef5d652d85 100644 > --- a/drivers/thermal/thermal_core.c > +++ b/drivers/thermal/thermal_core.c > @@ -291,14 +291,9 @@ static int __init thermal_register_governors(void) > static void thermal_zone_device_set_polling(struct thermal_zone_device *tz, > int delay) > { > - if (delay > 1000) > + if (delay) > mod_delayed_work(system_freezable_power_efficient_wq, > - &tz->poll_queue, > - round_jiffies(msecs_to_jiffies(delay))); > - else if (delay) > - mod_delayed_work(system_freezable_power_efficient_wq, > - &tz->poll_queue, > - msecs_to_jiffies(delay)); > + &tz->poll_queue, delay); > else > cancel_delayed_work(&tz->poll_queue); > } > @@ -317,9 +312,9 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz) > mutex_lock(&tz->lock); > > if (!stop && tz->passive) > - thermal_zone_device_set_polling(tz, tz->passive_delay_ms); > + thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies); > else if (!stop && tz->polling_delay_ms) > - thermal_zone_device_set_polling(tz, tz->polling_delay_ms); > + thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies); > else > thermal_zone_device_set_polling(tz, 0); > > Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 08c6e4e36896..16ef5d652d85 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -291,14 +291,9 @@ static int __init thermal_register_governors(void) static void thermal_zone_device_set_polling(struct thermal_zone_device *tz, int delay) { - if (delay > 1000) + if (delay) mod_delayed_work(system_freezable_power_efficient_wq, - &tz->poll_queue, - round_jiffies(msecs_to_jiffies(delay))); - else if (delay) - mod_delayed_work(system_freezable_power_efficient_wq, - &tz->poll_queue, - msecs_to_jiffies(delay)); + &tz->poll_queue, delay); else cancel_delayed_work(&tz->poll_queue); } @@ -317,9 +312,9 @@ static void monitor_thermal_zone(struct thermal_zone_device *tz) mutex_lock(&tz->lock); if (!stop && tz->passive) - thermal_zone_device_set_polling(tz, tz->passive_delay_ms); + thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies); else if (!stop && tz->polling_delay_ms) - thermal_zone_device_set_polling(tz, tz->polling_delay_ms); + thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies); else thermal_zone_device_set_polling(tz, 0);
The delays are also stored in jiffies based unit. Use them instead of the ms. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- drivers/thermal/thermal_core.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)