Commit 3c3ee53d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

thermal: core: Check passive delay in monitor_thermal_zone() 



The only case in which thermal_zone_device_set_polling() is called
with its second argument equal to zero is when passive cooling is
under way and passive_delay_jiffies is 0, which only happens when
the given thermal zone is not polled at all.

If monitor_thermal_zone() is modified to check passive_delay_jiffies
directly, the check of the thermal_zone_device_set_polling() second
argument against 0 can be dropped and a passive_delay check can be
dropped from thermal_zone_device_register_with_trips(), so change the
code accordingly.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/2004353.PYKUYFuaPT@rjwysocki.net
parent fcfacd54

drivers/thermal/thermal_core.c

+3 −13
Original line number Diff line number Diff line
@@ -323,11 +323,6 @@ static void thermal_zone_broken_disable(struct thermal_zone_device *tz) 
static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,

					    unsigned long delay)

{

	if (!delay) {

		cancel_delayed_work(&tz->poll_queue);

		return;

	}



	if (delay > HZ)

		delay = round_jiffies_relative(delay);
@@ -364,7 +359,7 @@ static void thermal_zone_recheck(struct thermal_zone_device *tz, int error) 


static void monitor_thermal_zone(struct thermal_zone_device *tz)

{

	if (tz->passive > 0)

	if (tz->passive > 0 && tz->passive_delay_jiffies)

		thermal_zone_device_set_polling(tz, tz->passive_delay_jiffies);

	else if (tz->polling_delay_jiffies)

		thermal_zone_device_set_polling(tz, tz->polling_delay_jiffies);
@@ -1411,14 +1406,9 @@ thermal_zone_device_register_with_trips(const char *type, 
	if (num_trips > 0 && !trips)

		return ERR_PTR(-EINVAL);



	if (polling_delay) {

		if (passive_delay > polling_delay)

	if (polling_delay && passive_delay > polling_delay)

		return ERR_PTR(-EINVAL);



		if (!passive_delay)

			passive_delay = polling_delay;

	}



	if (!thermal_class)

		return ERR_PTR(-ENODEV);