thermal/drivers/cxgb4: 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>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20221003092602.1323944-28-daniel.lezcano@linaro.org

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 5657ac8..fca9533 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -1079,8 +1079,6 @@ struct mbox_list {
 #if IS_ENABLED(CONFIG_THERMAL)
 struct ch_thermal {
        struct thermal_zone_device *tzdev;
-       int trip_temp;
-       int trip_type;
 };
 #endif
 

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c
index 9a6d652..95e1b41 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c
@@ -29,36 +29,12 @@ static int cxgb4_thermal_get_temp(struct thermal_zone_device *tzdev,
        return 0;
 }
 
-static int cxgb4_thermal_get_trip_type(struct thermal_zone_device *tzdev,
-                                      int trip, enum thermal_trip_type *type)
-{
-       struct adapter *adap = tzdev->devdata;
-
-       if (!adap->ch_thermal.trip_temp)
-               return -EINVAL;
-
-       *type = adap->ch_thermal.trip_type;
-       return 0;
-}
-
-static int cxgb4_thermal_get_trip_temp(struct thermal_zone_device *tzdev,
-                                      int trip, int *temp)
-{
-       struct adapter *adap = tzdev->devdata;
-
-       if (!adap->ch_thermal.trip_temp)
-               return -EINVAL;
-
-       *temp = adap->ch_thermal.trip_temp;
-       return 0;
-}
-
 static struct thermal_zone_device_ops cxgb4_thermal_ops = {
        .get_temp = cxgb4_thermal_get_temp,
-       .get_trip_type = cxgb4_thermal_get_trip_type,
-       .get_trip_temp = cxgb4_thermal_get_trip_temp,
 };
 
+static struct thermal_trip trip = { .type = THERMAL_TRIP_CRITICAL } ;
+
 int cxgb4_thermal_init(struct adapter *adap)
 {
        struct ch_thermal *ch_thermal = &adap->ch_thermal;
@@ -79,15 +55,14 @@ int cxgb4_thermal_init(struct adapter *adap)
        if (ret < 0) {
                num_trip = 0; /* could not get trip temperature */
        } else {
-               ch_thermal->trip_temp = val * 1000;
-               ch_thermal->trip_type = THERMAL_TRIP_CRITICAL;
+               trip.temperature = val * 1000;
        }
 
        snprintf(ch_tz_name, sizeof(ch_tz_name), "cxgb4_%s", adap->name);
-       ch_thermal->tzdev = thermal_zone_device_register(ch_tz_name, num_trip,
-                                                        0, adap,
-                                                        &cxgb4_thermal_ops,
-                                                        NULL, 0, 0);
+       ch_thermal->tzdev = thermal_zone_device_register_with_trips(ch_tz_name, &trip, num_trip,
+                                                                   0, adap,
+                                                                   &cxgb4_thermal_ops,
+                                                                   NULL, 0, 0);
        if (IS_ERR(ch_thermal->tzdev)) {
                ret = PTR_ERR(ch_thermal->tzdev);
                dev_err(adap->pdev_dev, "Failed to register thermal zone\n");