From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 29 Nov 2023 13:36:07 +0000 (+0100)
Subject: thermal: trip: Drop a redundant check from thermal_zone_set_trip()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=59730241647287c0ab64bf0bc7449308392b7ea4;p=linux.git

thermal: trip: Drop a redundant check from thermal_zone_set_trip()

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>
---

diff --git a/drivers/thermal/thermal_trip.c b/drivers/thermal/thermal_trip.c
index e42456442c68e..e3dd583234dde 100644
--- a/drivers/thermal/thermal_trip.c
+++ b/drivers/thermal/thermal_trip.c
@@ -153,9 +153,6 @@ int thermal_zone_set_trip(struct thermal_zone_device *tz, int trip_id,
 	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;