[v1,09/33] thermal/drivers/sprd: Switch to new of API

Message ID	20220710212423.681301-10-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, Orson Zhai <orsonzhai@gmail.com>, Baolin Wang <baolin.wang7@gmail.com>, Chunyan Zhang <zhang.lyra@gmail.com> Subject: [PATCH v1 09/33] thermal/drivers/sprd: Switch to new of API Date: Sun, 10 Jul 2022 23:23:59 +0200 Message-Id: <20220710212423.681301-10-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-10-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, Orson Zhai <orsonzhai@gmail.com>,
        Baolin Wang <baolin.wang7@gmail.com>,
        Chunyan Zhang <zhang.lyra@gmail.com>
Subject: [PATCH v1 09/33] thermal/drivers/sprd: Switch to new of API
Date: Sun, 10 Jul 2022 23:23:59 +0200
Message-Id: <20220710212423.681301-10-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:23 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/sprd_thermal.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/thermal/sprd_thermal.c b/drivers/thermal/sprd_thermal.c
index fff80fc18002..eb8e6bc0fc28 100644
--- a/drivers/thermal/sprd_thermal.c
+++ b/drivers/thermal/sprd_thermal.c
@@ -204,9 +204,9 @@  static int sprd_thm_temp_to_rawdata(int temp, struct sprd_thermal_sensor *sen)
 	return clamp(val, val, (u32)(SPRD_THM_RAW_DATA_HIGH - 1));
 }
 
-static int sprd_thm_read_temp(void *devdata, int *temp)
+static int sprd_thm_read_temp(struct thermal_zone_device *tz, int *temp)
 {
-	struct sprd_thermal_sensor *sen = devdata;
+	struct sprd_thermal_sensor *sen = tz->devdata;
 	u32 data;
 
 	data = readl(sen->data->base + SPRD_THM_TEMP(sen->id)) &
@@ -217,7 +217,7 @@  static int sprd_thm_read_temp(void *devdata, int *temp)
 	return 0;
 }
 
-static const struct thermal_zone_of_device_ops sprd_thm_ops = {
+static struct thermal_zone_device_ops sprd_thm_ops = {
 	.get_temp = sprd_thm_read_temp,
 };
 
@@ -408,10 +408,10 @@  static int sprd_thm_probe(struct platform_device *pdev)
 
 		sprd_thm_sensor_init(thm, sen);
 
-		sen->tzd = devm_thermal_zone_of_sensor_register(sen->dev,
-								sen->id,
-								sen,
-								&sprd_thm_ops);
+		sen->tzd = devm_thermal_of_zone_register(sen->dev,
+							 sen->id,
+							 sen,
+							 &sprd_thm_ops);
 		if (IS_ERR(sen->tzd)) {
 			dev_err(&pdev->dev, "register thermal zone failed %d\n",
 				sen->id);
@@ -523,8 +523,8 @@  static int sprd_thm_remove(struct platform_device *pdev)
 
 	for (i = 0; i < thm->nr_sensors; i++) {
 		sprd_thm_toggle_sensor(thm->sensor[i], false);
-		devm_thermal_zone_of_sensor_unregister(&pdev->dev,
-						       thm->sensor[i]->tzd);
+		devm_thermal_of_zone_unregister(&pdev->dev,
+						thm->sensor[i]->tzd);
 	}
 
 	clk_disable_unprepare(thm->clk);

[v1,09/33] thermal/drivers/sprd: Switch to new of API

Commit Message

Patch