[PATCH v1 18/18] thermal/drivers/int340x: Migrate to thermal_zone_device_register()

From: AngeloGioacchino Del Regno
Date: Tue Jan 30 2024 - 06:19:44 EST


The thermal API has a new thermal_zone_device_register() function which
is deprecating the older thermal_zone_device_register_with_trips() and
thermal_tripless_zone_device_register().

Migrate to the new thermal zone device registration function.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@xxxxxxxxxxxxx>
---
.../intel/int340x_thermal/int3400_thermal.c | 20 +++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
index 427d370648d5..d8ca7ed37950 100644
--- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c
@@ -536,11 +536,6 @@ static struct thermal_zone_device_ops int3400_thermal_ops = {
.change_mode = int3400_thermal_change_mode,
};

-static struct thermal_zone_params int3400_thermal_params = {
- .governor_name = "user_space",
- .no_hwmon = true,
-};
-
static void int3400_setup_gddv(struct int3400_thermal_priv *priv)
{
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
@@ -572,6 +567,16 @@ static void int3400_setup_gddv(struct int3400_thermal_priv *priv)
static int int3400_thermal_probe(struct platform_device *pdev)
{
struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
+ struct thermal_zone_device_params tzdp = {
+ .tzp = {
+ .type = "INT3400 Thermal",
+ .no_hwmon = true,
+ .ops = &int3400_thermal_ops,
+ }
+ };
+ struct thermal_governor_params tgp = {
+ .governor_name = "user_space"
+ };
struct int3400_thermal_priv *priv;
int result;

@@ -609,9 +614,8 @@ static int int3400_thermal_probe(struct platform_device *pdev)

evaluate_odvp(priv);

- priv->thermal = thermal_tripless_zone_device_register("INT3400 Thermal", priv,
- &int3400_thermal_ops,
- &int3400_thermal_params);
+ tzdp.tgp = &tgp;
+ priv->thermal = thermal_zone_device_register(&tzdp);
if (IS_ERR(priv->thermal)) {
result = PTR_ERR(priv->thermal);
goto free_art_trt;
--
2.43.0