[v1,19/33] thermal/drivers/qoriq: Switch to new of API

Message ID	20220710212423.681301-20-daniel.lezcano@linexp.org
State	Superseded
Headers	show Return-Path: <linux-pm-owner@kernel.org> From: Daniel Lezcano <daniel.lezcano@linexp.org> To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: rui.zhang@intel.com, khilman@baylibre.com, abailon@baylibre.com, amitk@kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH v1 19/33] thermal/drivers/qoriq: Switch to new of API Date: Sun, 10 Jul 2022 23:24:09 +0200 Message-Id: <20220710212423.681301-20-daniel.lezcano@linexp.org> In-Reply-To: <20220710212423.681301-1-daniel.lezcano@linexp.org> References: <20220710212423.681301-1-daniel.lezcano@linexp.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	New thermal OF code \| expand [v1,00/33] New thermal OF code [v1,01/33] thermal/of: Rework the thermal device tree initialization [v1,02/33] thermal/of: Make new code and old code co-exist [v1,03/33] thermal/drivers/rockchip: Switch to new of API [v1,04/33] thermal/drivers/uniphier: Switch to new of API [v1,05/33] thermal/drivers/generic-adc: Switch to new of API [v1,06/33] thermal/drivers/mmio: Switch to new of API [v1,07/33] thermal/drivers/tegra: Switch to new of API [v1,08/33] thermal/drivers/sun8i: Switch to new of API [v1,09/33] thermal/drivers/sprd: Switch to new of API [v1,10/33] thermal/drivers/broadcom: Switch to new of API [v1,11/33] thermal/drivers/qcom: Switch to new of API [v1,12/33] thermal/drivers/st: Switch to new of API [v1,13/33] thermal/drivers/amlogic: Switch to new of API [v1,14/33] thermal/drivers/armada: Switch to new of API [v1,15/33] thermal/drivers/db8500: Switch to new of API [v1,16/33] thermal/drivers/imx: Switch to new of API [v1,17/33] thermal/drivers/rcar: Switch to new of API [v1,18/33] thermal/drivers/rzg2l: Switch to new of API [v1,19/33] thermal/drivers/qoriq: Switch to new of API [v1,20/33] thermal/drivers/mtk: Switch to new of API [v1,21/33] thermal/drivers/banggap: Switch to new of API [v1,22/33] thermal/drivers/maxim: Switch to new of API [v1,23/33] thermal/drivers/hisilicon: Switch to new of API [v1,24/33] thermal/drivers/ti-soc: Switch to new of API [v1,25/33] ata/drivers/ahci_imx: Switch to new of thermal API [v1,26/33] hwmon/drivers: Switch to new of thermal API [v1,27/33] iio/drivers/sun4i_gpadc: Switch to new of thermal API [v1,28/33] input/drivers/touchscreen_sun4i: Switch to new of thermal API [v1,29/33] regulator/drivers/max8976: Switch to new of thermal API [v1,30/33] thermal/drivers/bcm2835: Switch to new of thermal API [v1,31/33] thermal/drivers/samsung: Switch to new of thermal API [v1,32/33] thermal/core: Move set_trip_temp ops to the sysfs code [v1,33/33] thermal/of: Remove old OF code

Message ID

20220710212423.681301-20-daniel.lezcano@linexp.org

State

Superseded

Headers

From: Daniel Lezcano <daniel.lezcano@linexp.org>
To: daniel.lezcano@linaro.org, rafael@kernel.org
Cc: rui.zhang@intel.com, khilman@baylibre.com, abailon@baylibre.com,
        amitk@kernel.org, linux-kernel@vger.kernel.org,
        linux-pm@vger.kernel.org
Subject: [PATCH v1 19/33] thermal/drivers/qoriq: Switch to new of API
Date: Sun, 10 Jul 2022 23:24:09 +0200
Message-Id: <20220710212423.681301-20-daniel.lezcano@linexp.org>
In-Reply-To: <20220710212423.681301-1-daniel.lezcano@linexp.org>
References: <20220710212423.681301-1-daniel.lezcano@linexp.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

New thermal OF code | expand

Commit Message

Daniel Lezcano July 10, 2022, 9:24 p.m. UTC

The thermal OF code has a new API allowing to migrate the OF
initialization to a simpler approach.

Use this new API.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linexp.org>
---
 drivers/thermal/qoriq_thermal.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index 73049f9bea25..86c8cdabcbbe 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -82,9 +82,9 @@  static struct qoriq_tmu_data *qoriq_sensor_to_data(struct qoriq_sensor *s)
 	return container_of(s, struct qoriq_tmu_data, sensor[s->id]);
 }
 
-static int tmu_get_temp(void *p, int *temp)
+static int tmu_get_temp(struct thermal_zone_device *tz, int *temp)
 {
-	struct qoriq_sensor *qsensor = p;
+	struct qoriq_sensor *qsensor = tz->devdata;
 	struct qoriq_tmu_data *qdata = qoriq_sensor_to_data(qsensor);
 	u32 val;
 	/*
@@ -122,7 +122,7 @@  static int tmu_get_temp(void *p, int *temp)
 	return 0;
 }
 
-static const struct thermal_zone_of_device_ops tmu_tz_ops = {
+static struct thermal_zone_device_ops tmu_tz_ops = {
 	.get_temp = tmu_get_temp,
 };
 
@@ -146,9 +146,9 @@  static int qoriq_tmu_register_tmu_zone(struct device *dev,
 
 		sensor->id = id;
 
-		tzd = devm_thermal_zone_of_sensor_register(dev, id,
-							   sensor,
-							   &tmu_tz_ops);
+		tzd = devm_thermal_of_zone_register(dev, id,
+						    sensor,
+						    &tmu_tz_ops);
 		ret = PTR_ERR_OR_ZERO(tzd);
 		if (ret) {
 			if (ret == -ENODEV)

[v1,19/33] thermal/drivers/qoriq: Switch to new of API

Commit Message

Patch