thermal: core: Drop thermal_zone_device_is_enabled()

JIRA: https://issues.redhat.com/browse/RHEL-61357

commit 54fccad
Author: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date:   Mon Aug 26 18:37:16 2024 +0200

    thermal: core: Drop thermal_zone_device_is_enabled()

    There are only two callers of thermal_zone_device_is_enabled()
    and one of them call is under the zone lock and the other one uses
    lockdep_assert_held() on that lock.  Thus the lockdep_assert_held()
    in thermal_zone_device_is_enabled() is redundant and it could be
    dropped, but then the function would merely become a wrapper around
    a simple tz->mode check that is more convenient to do directly.

    Accordingly, drop thermal_zone_device_is_enabled() altogether and update
    its callers to check tz->mode directly as appropriate.

    While at it, combine the tz->mode and tz->suspended checks in
    __thermal_zone_device_update() because they are of a similar category
    and if any of them evaluates to "true", the outcome is the same.

    No intentinal functional impact.

    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Link: https://patch.msgid.link/9353673.CDJkKcVGEf@rjwysocki.net

Signed-off-by: David Arcari <darcari@redhat.com>

Author: darcari

drivers/thermal/thermal_core.c

@@ -547,10 +547,7 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
 	int low = -INT_MAX, high = INT_MAX;
 	int temp, ret;
 
-	if (tz->suspended)
-		return;
-
-	if (!thermal_zone_device_is_enabled(tz))
+	if (tz->suspended || tz->mode != THERMAL_DEVICE_ENABLED)
 		return;
 
 	ret = __thermal_zone_get_temp(tz, &temp);
@@ -652,13 +649,6 @@ int thermal_zone_device_disable(struct thermal_zone_device *tz)
 }
 EXPORT_SYMBOL_GPL(thermal_zone_device_disable);
 
-int thermal_zone_device_is_enabled(struct thermal_zone_device *tz)
-{
-	lockdep_assert_held(&tz->lock);
-
-	return tz->mode == THERMAL_DEVICE_ENABLED;
-}
-
 static bool thermal_zone_is_present(struct thermal_zone_device *tz)
 {
 	return !list_empty(&tz->node);

drivers/thermal/thermal_core.h

@@ -287,7 +287,4 @@ thermal_cooling_device_stats_update(struct thermal_cooling_device *cdev,
 				    unsigned long new_state) {}
 #endif /* CONFIG_THERMAL_STATISTICS */
 
-/* device tree support */
-int thermal_zone_device_is_enabled(struct thermal_zone_device *tz);
-
 #endif /* __THERMAL_CORE_H__ */

drivers/thermal/thermal_sysfs.c

@@ -53,7 +53,7 @@ mode_show(struct device *dev, struct device_attribute *attr, char *buf)
 	int enabled;
 
 	mutex_lock(&tz->lock);
-	enabled = thermal_zone_device_is_enabled(tz);
+	enabled = tz->mode == THERMAL_DEVICE_ENABLED;
 	mutex_unlock(&tz->lock);
 
 	return sprintf(buf, "%s\n", enabled ? "enabled" : "disabled");