| Message ID | 20230525140135.3589917-2-daniel.lezcano@linaro.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/8] net/mlx5: Update the driver with the recent thermal changes | expand |
On Thu, May 25, 2023 at 04:01:28PM +0200, Daniel Lezcano wrote: > 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>
On 25 May 16:01, Daniel Lezcano wrote: >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. > I see this patch is part of a large series, do you expect me to re-post to net-next or you are going to submit via another tree ?
On 01/06/2023 00:10, Saeed Mahameed wrote: > On 25 May 16:01, Daniel Lezcano wrote: >> 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. >> > > I see this patch is part of a large series, do you expect me to re-post to > net-next or you are going to submit via another tree ? Sorry for the delay. Yes, this patch is targeted for the thermal tree. The last patch of the series depends on it as it moves the thermal zone device structure to the private thermal header, thus the structure internals won't be accessible from this driver anymore.
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/thermal.c b/drivers/net/ethernet/mellanox/mlx5/core/thermal.c index e47fa6fb836f..20bb5eb266c1 100644 --- 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));
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> --- drivers/net/ethernet/mellanox/mlx5/core/thermal.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)