mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
95d3d353f8
Copy patches from patches-6.1 to patches-6.6. No changes. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
80 lines
2.8 KiB
Diff
80 lines
2.8 KiB
Diff
From 5a72b8e4bac753e4dc74dc0a1335d120f63df97a Mon Sep 17 00:00:00 2001
|
|
From: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Date: Wed, 1 Mar 2023 21:14:37 +0100
|
|
Subject: [PATCH 09/42] thermal: Don't use 'device' internal thermal zone
|
|
structure field
|
|
|
|
Some drivers are directly using the thermal zone's 'device' structure
|
|
field.
|
|
|
|
Use the driver device pointer instead of the thermal zone device when
|
|
it is available.
|
|
|
|
Remove the traces when they are duplicate with the traces in the core
|
|
code.
|
|
|
|
[again skipped imx_thermal.c]
|
|
|
|
Cc: Jean Delvare <jdelvare@suse.com>
|
|
Cc: Guenter Roeck <linux@roeck-us.net>
|
|
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
|
|
Reviewed-by: Balsam CHIHI <bchihi@baylibre.com> #Mediatek LVTS
|
|
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> #MediaTek LVTS
|
|
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
|
|
---
|
|
drivers/thermal/mediatek/lvts_thermal.c | 4 ++--
|
|
drivers/thermal/thermal_hwmon.c | 4 ++--
|
|
drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 2 +-
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/thermal/mediatek/lvts_thermal.c
|
|
+++ b/drivers/thermal/mediatek/lvts_thermal.c
|
|
@@ -305,7 +305,7 @@ static int lvts_set_trips(struct thermal
|
|
* 14-0 : Raw temperature for threshold
|
|
*/
|
|
if (low != -INT_MAX) {
|
|
- dev_dbg(&tz->device, "Setting low limit temperature interrupt: %d\n", low);
|
|
+ pr_debug("%s: Setting low limit temperature interrupt: %d\n", tz->type, low);
|
|
writel(raw_low, LVTS_H2NTHRE(base));
|
|
}
|
|
|
|
@@ -318,7 +318,7 @@ static int lvts_set_trips(struct thermal
|
|
*
|
|
* 14-0 : Raw temperature for threshold
|
|
*/
|
|
- dev_dbg(&tz->device, "Setting high limit temperature interrupt: %d\n", high);
|
|
+ pr_debug("%s: Setting high limit temperature interrupt: %d\n", tz->type, high);
|
|
writel(raw_high, LVTS_HTHRE(base));
|
|
|
|
return 0;
|
|
--- a/drivers/thermal/thermal_hwmon.c
|
|
+++ b/drivers/thermal/thermal_hwmon.c
|
|
@@ -220,14 +220,14 @@ void thermal_remove_hwmon_sysfs(struct t
|
|
hwmon = thermal_hwmon_lookup_by_type(tz);
|
|
if (unlikely(!hwmon)) {
|
|
/* Should never happen... */
|
|
- dev_dbg(&tz->device, "hwmon device lookup failed!\n");
|
|
+ dev_dbg(hwmon->device, "hwmon device lookup failed!\n");
|
|
return;
|
|
}
|
|
|
|
temp = thermal_hwmon_lookup_temp(hwmon, tz);
|
|
if (unlikely(!temp)) {
|
|
/* Should never happen... */
|
|
- dev_dbg(&tz->device, "temperature input lookup failed!\n");
|
|
+ dev_dbg(hwmon->device, "temperature input lookup failed!\n");
|
|
return;
|
|
}
|
|
|
|
--- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
|
|
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
|
|
@@ -43,7 +43,7 @@ static void ti_thermal_work(struct work_
|
|
|
|
thermal_zone_device_update(data->ti_thermal, THERMAL_EVENT_UNSPECIFIED);
|
|
|
|
- dev_dbg(&data->ti_thermal->device, "updated thermal zone %s\n",
|
|
+ dev_dbg(data->bgp->dev, "updated thermal zone %s\n",
|
|
data->ti_thermal->type);
|
|
}
|
|
|