@@ -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 };
@@ -571,6 +566,14 @@ static void int3400_setup_gddv(struct int3400_thermal_priv *priv)
static int int3400_thermal_probe(struct platform_device *pdev)
{
+ struct thermal_zone_device_params tzdp = {
+ .type = "INT3400 Thermal",
+ .tzp = {
+ .governor_name = "user_space",
+ .no_hwmon = true
+ },
+ .ops = &int3400_thermal_ops
+ };
struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
struct int3400_thermal_priv *priv;
int result;
@@ -609,9 +612,7 @@ 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);
+ priv->thermal = thermal_zone_device_register(&tzdp);
if (IS_ERR(priv->thermal)) {
result = PTR_ERR(priv->thermal);
goto free_art_trt;
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@collabora.com> --- .../intel/int340x_thermal/int3400_thermal.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)