Skip to content

Commit

Permalink
thermal: core: Drop redundant checks from thermal_bind_cdev_to_trip()
Browse files Browse the repository at this point in the history
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 <rafael.j.wysocki@intel.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://patch.msgid.link/4607540.LvFx2qVVIh@rjwysocki.net
  • Loading branch information
Rafael J. Wysocki committed Aug 23, 2024
1 parent 91d7ed9 commit 24aad19
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions drivers/thermal/thermal_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 24aad19

Please sign in to comment.