Message ID | 4897451.31r3eYUQgx@kreacher (mailing list archive) |
---|---|
State | Mainlined, archived |
Headers | show |
Series | thermal: trip: Rework thermal_zone_set_trip() and its callers | expand |
On 29/11/2023 14:36, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > After recent changes in the thermal framework, a trip points array is > required for registering a thermal zone that is not tripless, so the > tz->trips pointer in thermal_zone_set_trip() is never NULL and the > check involving it is redundant. Drop that check. > > No functional impact. > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > Reviewed-by: Lukasz Luba <lukasz.luba@arm.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
On Wed, Nov 29, 2023 at 4:26 PM Daniel Lezcano <daniel.lezcano@linaro.org> wrote: > > On 29/11/2023 14:36, Rafael J. Wysocki wrote: > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > > > After recent changes in the thermal framework, a trip points array is > > required for registering a thermal zone that is not tripless, so the > > tz->trips pointer in thermal_zone_set_trip() is never NULL and the > > check involving it is redundant. Drop that check. > > > > No functional impact. > > > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > Reviewed-by: Lukasz Luba <lukasz.luba@arm.com> > > Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Applied, thanks!
Index: linux-pm/drivers/thermal/thermal_trip.c =================================================================== --- linux-pm.orig/drivers/thermal/thermal_trip.c +++ linux-pm/drivers/thermal/thermal_trip.c @@ -153,9 +153,6 @@ int thermal_zone_set_trip(struct thermal struct thermal_trip t; int ret; - if (!tz->ops->set_trip_temp && !tz->ops->set_trip_hyst && !tz->trips) - return -EINVAL; - ret = __thermal_zone_get_trip(tz, trip_id, &t); if (ret) return ret;