On Tue, Feb 21, 2023 at 7:08 PM Daniel Lezcano
<daniel.lezcano@xxxxxxxxxx> wrote:
>
> The 'type' field is used as a name in the message. However we can have
> multiple thermal zone with the same type. The information is not
> accurate.
>
> Moreover, the thermal zone device structure is directly accessed while
> we want to improve the self-encapsulation of the code.
>
> Replace the 'type' in the message by the thermal zone id.
>
> Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
> Reviewed-by: Ido Schimmel <idosch@xxxxxxxxxx> #mlxsw
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> ---
> drivers/acpi/thermal.c | 2 +-
> drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 4 ++--
> drivers/thermal/mediatek/lvts_thermal.c | 5 +----
> drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 4 ++--
> 4 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
> index 392b73b3e269..b55a3b0ad9ed 100644
> --- a/drivers/acpi/thermal.c
> +++ b/drivers/acpi/thermal.c
> @@ -842,7 +842,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
> goto acpi_bus_detach;
>
> dev_info(&tz->device->dev, "registered as thermal_zone%d\n",
> - tz->thermal_zone->id);
> + thermal_zone_device_get_id(tz->thermal_zone));
>
> return 0;
>
> diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> index 722e4a40afef..a997fca211ba 100644
> --- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> +++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
> @@ -176,8 +176,8 @@ mlxsw_thermal_module_trips_update(struct device *dev, struct mlxsw_core *core,
> }
>
> if (crit_temp > emerg_temp) {
> - dev_warn(dev, "%s : Critical threshold %d is above emergency threshold %d\n",
> - tz->tzdev->type, crit_temp, emerg_temp);
> + dev_warn(dev, "tz id %d: Critical threshold %d is above emergency threshold %d\n",
> + thermal_zone_device_get_id(tz->tzdev), crit_temp, emerg_temp);
> return 0;
> }
>
> diff --git a/drivers/thermal/mediatek/lvts_thermal.c b/drivers/thermal/mediatek/lvts_thermal.c
> index beb835d644e2..155cef8ed3f5 100644
> --- a/drivers/thermal/mediatek/lvts_thermal.c
> +++ b/drivers/thermal/mediatek/lvts_thermal.c
> @@ -304,10 +304,8 @@ static int lvts_set_trips(struct thermal_zone_device *tz, int low, int high)
> *
> * 14-0 : Raw temperature for threshold
> */
> - if (low != -INT_MAX) {
> - pr_debug("%s: Setting low limit temperature interrupt: %d\n", tz->type, low);
> + if (low != -INT_MAX)
> writel(raw_low, LVTS_H2NTHRE(base));
> - }
>
> /*
> * Hot temperature threshold
> @@ -318,7 +316,6 @@ static int lvts_set_trips(struct thermal_zone_device *tz, int low, int high)
> *
> * 14-0 : Raw temperature for threshold
> */
> - pr_debug("%s: Setting high limit temperature interrupt: %d\n", tz->type, high);
> writel(raw_high, LVTS_HTHRE(base));
>
> return 0;
> diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
> index 060f46cea5ff..488b08fc20e4 100644
> --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
> +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
> @@ -43,8 +43,8 @@ static void ti_thermal_work(struct work_struct *work)
>
> thermal_zone_device_update(data->ti_thermal, THERMAL_EVENT_UNSPECIFIED);
>
> - dev_dbg(data->bgp->dev, "updated thermal zone %s\n",
> - data->ti_thermal->type);
> + dev_dbg(data->bgp->dev, "updated thermal zone id %d\n",
> + thermal_zone_device_get_id(data->ti_thermal));
> }
>
> /**
> --
> 2.34.1
>
