net/mlx5: Update the driver with the recent thermal changes

The thermal framework is migrating to the generic trip points. The set
of changes also implies a self-encapsulation of the thermal zone
device structure where the internals are no longer directly accessible
but with accessors.

Use the new API instead, so the next changes can be pushed in the
thermal framework without this driver failing to compile.

No functional changes intended.

Cc: Sandipan Patra <spatra@nvidia.com>
Cc: Gal Pressman <gal@nvidia.com>
Cc: Saeed Mahameed <saeedm@nvidia.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230525140135.3589917-2-daniel.lezcano@linaro.org

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/thermal.c b/drivers/net/ethernet/mellanox/mlx5/core/thermal.c
index e47fa6fb836f1cc1ed40da6690943d24551eb4c4..20bb5eb266c1f11797d9c8ee63269400366ddb49 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/thermal.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/thermal.c
@@ -45,7 +45,7 @@ static int mlx5_thermal_get_mtmp_temp(struct mlx5_core_dev *mdev, u32 id, int *p
 static int mlx5_thermal_get_temp(struct thermal_zone_device *tzdev,
                                 int *p_temp)
 {
-       struct mlx5_thermal *thermal = tzdev->devdata;
+       struct mlx5_thermal *thermal = thermal_zone_device_priv(tzdev);
        struct mlx5_core_dev *mdev = thermal->mdev;
        int err;
 
@@ -81,12 +81,13 @@ int mlx5_thermal_init(struct mlx5_core_dev *mdev)
                return -ENOMEM;
 
        thermal->mdev = mdev;
-       thermal->tzdev = thermal_zone_device_register(data,
-                                                     MLX5_THERMAL_NUM_TRIPS,
-                                                     MLX5_THERMAL_TRIP_MASK,
-                                                     thermal,
-                                                     &mlx5_thermal_ops,
-                                                     NULL, 0, MLX5_THERMAL_POLL_INT_MSEC);
+       thermal->tzdev = thermal_zone_device_register_with_trips(data,
+                                                                NULL,
+                                                                MLX5_THERMAL_NUM_TRIPS,
+                                                                MLX5_THERMAL_TRIP_MASK,
+                                                                thermal,
+                                                                &mlx5_thermal_ops,
+                                                                NULL, 0, MLX5_THERMAL_POLL_INT_MSEC);
        if (IS_ERR(thermal->tzdev)) {
                dev_err(mdev->device, "Failed to register thermal zone device (%s) %ld\n",
                        data, PTR_ERR(thermal->tzdev));