thermal: core: Drop redundant thermal instance checks

Because the trip and cdev pointers are sufficient to identify a thermal
instance holding them unambiguously, drop the additional thermal zone
checks from two loops walking the list of thermal instances in a
thermal zone.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://patch.msgid.link/10527734.nUPlyArG6x@rjwysocki.net

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 903971f8f08cd15dd5d3b94638382aa56b11dfb4..0085a8df85236b3237619c8915bc6f4c7013694d 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -858,7 +858,7 @@ int thermal_bind_cdev_to_trip(struct thermal_zone_device *tz,
        mutex_lock(&tz->lock);
        mutex_lock(&cdev->lock);
        list_for_each_entry(pos, &tz->thermal_instances, tz_node)
-               if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) {
+               if (pos->trip == trip && pos->cdev == cdev) {
                        result = -EEXIST;
                        break;
                }
@@ -923,7 +923,7 @@ int thermal_unbind_cdev_from_trip(struct thermal_zone_device *tz,
        mutex_lock(&tz->lock);
        mutex_lock(&cdev->lock);
        list_for_each_entry_safe(pos, next, &tz->thermal_instances, tz_node) {
-               if (pos->tz == tz && pos->trip == trip && pos->cdev == cdev) {
+               if (pos->trip == trip && pos->cdev == cdev) {
                        list_del(&pos->tz_node);
                        list_del(&pos->cdev_node);