thermal/drivers/hisi: Use generic thermal_zone_get_trip() function

The thermal framework gives the possibility to register the trip
points with the thermal zone. When that is done, no get_trip_* ops are
needed and they can be removed.

Convert ops content logic into generic trip points and register them with the
thermal zone.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20221003092602.1323944-13-daniel.lezcano@linaro.org

diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index d6974db..45226ca 100644 (file)
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -482,7 +482,7 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
                                        struct hisi_thermal_sensor *sensor)
 {
        int ret, i;
-       const struct thermal_trip *trip;
+       struct thermal_trip trip;
 
        sensor->tzd = devm_thermal_of_zone_register(&pdev->dev,
                                                    sensor->id, sensor,
@@ -495,11 +495,12 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
                return ret;
        }
 
-       trip = of_thermal_get_trip_points(sensor->tzd);
+       for (i = 0; i < thermal_zone_get_num_trips(sensor->tzd); i++) {
 
-       for (i = 0; i < of_thermal_get_ntrips(sensor->tzd); i++) {
-               if (trip[i].type == THERMAL_TRIP_PASSIVE) {
-                       sensor->thres_temp = trip[i].temperature;
+               thermal_zone_get_trip(sensor->tzd, i, &trip);
+
+               if (trip.type == THERMAL_TRIP_PASSIVE) {
+                       sensor->thres_temp = trip.temperature;
                        break;
                }
        }