From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 6 May 2024 10:23:50 +0000 (+0200)
Subject: Merge back thermal cotntrol material for v6.10.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=00211025270741a6190df2cf01747723ef673a1f;p=linux.git

Merge back thermal cotntrol material for v6.10.
---

00211025270741a6190df2cf01747723ef673a1f
diff --cc drivers/thermal/thermal_debugfs.c
index 5693cc8b231aa,40ea0071a691e..c81e26a6a30f5
--- a/drivers/thermal/thermal_debugfs.c
+++ b/drivers/thermal/thermal_debugfs.c
@@@ -751,9 -744,8 +751,9 @@@ static void tze_seq_stop(struct seq_fil
  
  static int tze_seq_show(struct seq_file *s, void *v)
  {
 -	struct thermal_zone_device *tz = s->private;
 +	struct thermal_debugfs *thermal_dbg = s->private;
 +	struct thermal_zone_device *tz = thermal_dbg->tz_dbg.tz;
- 	struct thermal_trip *trip;
+ 	struct thermal_trip_desc *td;
  	struct tz_episode *tze;
  	const char *type;
  	int trip_id;