[v1,03/33] thermal/drivers/rockchip: Switch to new of API

Message ID	20220710212423.681301-4-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, Heiko Stuebner <heiko@sntech.de>, linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC support), linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC support) Subject: [PATCH v1 03/33] thermal/drivers/rockchip: Switch to new of API Date: Sun, 10 Jul 2022 23:23:53 +0200 Message-Id: <20220710212423.681301-4-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-4-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, Heiko Stuebner <heiko@sntech.de>,
        linux-arm-kernel@lists.infradead.org (moderated list:ARM/Rockchip SoC
        support),
        linux-rockchip@lists.infradead.org (open list:ARM/Rockchip SoC
 support)
Subject: [PATCH v1 03/33] thermal/drivers/rockchip: Switch to new of API
Date: Sun, 10 Jul 2022 23:23:53 +0200
Message-Id: <20220710212423.681301-4-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/rockchip_thermal.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index dc3a9c276a09..ea3abfb8e6c8 100644
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -1211,9 +1211,9 @@  static irqreturn_t rockchip_thermal_alarm_irq_thread(int irq, void *dev)
 	return IRQ_HANDLED;
 }
 
-static int rockchip_thermal_set_trips(void *_sensor, int low, int high)
+static int rockchip_thermal_set_trips(struct thermal_zone_device *tz, int low, int high)
 {
-	struct rockchip_thermal_sensor *sensor = _sensor;
+	struct rockchip_thermal_sensor *sensor = tz->devdata;
 	struct rockchip_thermal_data *thermal = sensor->thermal;
 	const struct rockchip_tsadc_chip *tsadc = thermal->chip;
 
@@ -1224,9 +1224,9 @@  static int rockchip_thermal_set_trips(void *_sensor, int low, int high)
 				     sensor->id, thermal->regs, high);
 }
 
-static int rockchip_thermal_get_temp(void *_sensor, int *out_temp)
+static int rockchip_thermal_get_temp(struct thermal_zone_device *tz, int *out_temp)
 {
-	struct rockchip_thermal_sensor *sensor = _sensor;
+	struct rockchip_thermal_sensor *sensor = tz->devdata;
 	struct rockchip_thermal_data *thermal = sensor->thermal;
 	const struct rockchip_tsadc_chip *tsadc = sensor->thermal->chip;
 	int retval;
@@ -1239,7 +1239,7 @@  static int rockchip_thermal_get_temp(void *_sensor, int *out_temp)
 	return retval;
 }
 
-static const struct thermal_zone_of_device_ops rockchip_of_thermal_ops = {
+static struct thermal_zone_device_ops rockchip_of_thermal_ops = {
 	.get_temp = rockchip_thermal_get_temp,
 	.set_trips = rockchip_thermal_set_trips,
 };
@@ -1326,8 +1326,8 @@  rockchip_thermal_register_sensor(struct platform_device *pdev,
 
 	sensor->thermal = thermal;
 	sensor->id = id;
-	sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, id,
-					sensor, &rockchip_of_thermal_ops);
+	sensor->tzd = devm_thermal_of_zone_register(&pdev->dev, id, sensor,
+						    &rockchip_of_thermal_ops);
 	if (IS_ERR(sensor->tzd)) {
 		error = PTR_ERR(sensor->tzd);
 		dev_err(&pdev->dev, "failed to register sensor %d: %d\n",

[v1,03/33] thermal/drivers/rockchip: Switch to new of API

Commit Message

Patch