On 5/18/24 14:12, Raphael Gallais-Pou wrote:
> Switch to thermal_of_zone to handle thermal-zones. Replace
> thermal_zone_device_register() by devm_thermal_of_zone_register() and
> remove ops st_thermal_get_trip_type, st_thermal_get_trip_temp.
>
> Signed-off-by: Raphael Gallais-Pou <rgallaispou@xxxxxxxxx>
> ---
> drivers/thermal/st/Kconfig | 1 +
> drivers/thermal/st/st_thermal.c | 20 ++++++++++----------
> 2 files changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/thermal/st/Kconfig b/drivers/thermal/st/Kconfig
> index ecbdf4ef00f4..2d08147876ee 100644
> --- a/drivers/thermal/st/Kconfig
> +++ b/drivers/thermal/st/Kconfig
> @@ -5,6 +5,7 @@
>
> config ST_THERMAL
> tristate "Thermal sensors on STMicroelectronics STi series of SoCs"
> + depends on THERMAL_OF
> help
> Support for thermal sensors on STMicroelectronics STi series of SoCs.
>
> diff --git a/drivers/thermal/st/st_thermal.c b/drivers/thermal/st/st_thermal.c
> index 5f33543a3a54..60e70de724d4 100644
> --- a/drivers/thermal/st/st_thermal.c
> +++ b/drivers/thermal/st/st_thermal.c
> @@ -12,6 +12,7 @@
> #include <linux/of_device.h>
>
> #include "st_thermal.h"
> +#include "../thermal_hwmon.h"
>
> /* The Thermal Framework expects millidegrees */
> #define mcelsius(temp) ((temp) * 1000)
> @@ -203,23 +204,21 @@ int st_thermal_register(struct platform_device *pdev,
> trip.type = THERMAL_TRIP_CRITICAL;
>
> sensor->thermal_dev =
> - thermal_zone_device_register_with_trips(dev_name(dev), &trip, 1, sensor,
> - &st_tz_ops, NULL, 0, polling_delay);
> + devm_thermal_of_zone_register(dev, 0, sensor, &st_tz_ops);
The struct trip becomes no more used, it can be removed.
> if (IS_ERR(sensor->thermal_dev)) {
> - dev_err(dev, "failed to register thermal zone device\n");
> + dev_err(dev, "failed to register thermal of zone\n");
> ret = PTR_ERR(sensor->thermal_dev);
> goto sensor_off;
> }
> - ret = thermal_zone_device_enable(sensor->thermal_dev);
> - if (ret)
> - goto tzd_unregister;
>
> platform_set_drvdata(pdev, sensor);
>
> - return 0;
> + /*
> + * devm_thermal_of_zone_register() doesn't enable hwmon by default
> + * Enable it here
> + */
> + return devm_thermal_add_hwmon_sysfs(dev, sensor->thermal_dev);
>
> -tzd_unregister:
> - thermal_zone_device_unregister(sensor->thermal_dev);
> sensor_off:
> st_thermal_sensor_off(sensor);
>
> @@ -232,7 +231,8 @@ void st_thermal_unregister(struct platform_device *pdev)
> struct st_thermal_sensor *sensor = platform_get_drvdata(pdev);
>
> st_thermal_sensor_off(sensor);
> - thermal_zone_device_unregister(sensor->thermal_dev);
> + thermal_remove_hwmon_sysfs(sensor->thermal_dev);
> + devm_thermal_of_zone_unregister(sensor->dev, sensor->thermal_dev);
> }
> EXPORT_SYMBOL_GPL(st_thermal_unregister);
>
>
