]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
thermal: core: Drop dead code from monitor_thermal_zone()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 26 Aug 2024 16:31:32 +0000 (18:31 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 5 Sep 2024 10:33:18 +0000 (12:33 +0200)
Since monitor_thermal_zone() is only called when the given thermal zone
has been enabled, as per the thermal_zone_device_is_enabled() check in
__thermal_zone_device_update(), the tz->mode check in it always
evaluates to "false" and the thermal_zone_device_set_polling()
invocation depending on it is dead code, so drop it.

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/10547425.nUPlyArG6x@rjwysocki.net
drivers/thermal/thermal_core.c

index 9215a7bc92c79385b08dbee0d6118e16188f80ac..2f11d271300a096ab8e17db2e0d58b7e1155c996 100644 (file)
@@ -364,9 +364,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->mode != THERMAL_DEVICE_ENABLED)
-               thermal_zone_device_set_polling(tz, 0);
-       else if (tz->passive > 0)
+       if (tz->passive > 0)
                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);