From: Rafael J. Wysocki Date: Thu, 22 Aug 2024 19:26:09 +0000 (+0200) Subject: thermal: core: Drop redundant checks from thermal_bind_cdev_to_trip() X-Git-Tag: v6.12-rc1~216^2~2^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24aad192c671720744a558d38c4033b4b36ba5f1;p=thirdparty%2Fkernel%2Flinux.git thermal: core: Drop redundant checks from thermal_bind_cdev_to_trip() Since thermal_bind_cdev_to_trip() is only called by thermal_zone_cdev_binding() under the thermal zone lock and the latter is only called by thermal_zone_device_register_with_trips() and __thermal_cooling_device_register(), under thermal_list_lock in both cases, both lockdep_assert_held() assertions can be dropped from it. Moreover, in both cases thermal_zone_cdev_binding() is called after both tz and cdev have been added to the global lists of thermal zones and cooling device, respectively, so the check against their list nodes in thermal_bind_cdev_to_trip() is redundant and can be dropped either. Link: https://lore.kernel.org/linux-pm/CAJZ5v0jwkc2PB+osSkkYF9vJ1Vpp3MFE=cGQmQ2Xzjb3yjVfJg@mail.gmail.com/ Signed-off-by: Rafael J. Wysocki Acked-by: Daniel Lezcano Link: https://patch.msgid.link/4607540.LvFx2qVVIh@rjwysocki.net --- diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 5a904a571e999..8c52746c5eba5 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -787,12 +787,6 @@ static int thermal_bind_cdev_to_trip(struct thermal_zone_device *tz, bool upper_no_limit; int result; - lockdep_assert_held(&thermal_list_lock); - lockdep_assert_held(&tz->lock); - - if (list_empty(&tz->node) || list_empty(&cdev->node)) - return -EINVAL; - /* lower default 0, upper default max_state */ if (cool_spec->lower == THERMAL_NO_LIMIT) cool_spec->lower = 0;