[thermal:,thermal/fixes] thermal: core: Relocate the struct thermal_governor definition

Commit Message

thermal-bot for Stanislaw Gruszka May 14, 2024, 10:18 a.m. UTC

The following commit has been merged into the thermal/fixes branch of thermal:

Commit-ID:     0444d574fbc3d3af0e426f7c2b72f5830269f096
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//0444d574fbc3d3af0e426f7c2b72f5830269f096
Author:        Rafael J. Wysocki <[e-mail]>
AuthorDate:    Thu, 04 Apr 2024 21:27:07 +02:00
Committer:     Rafael J. Wysocki <[e-mail]>
CommitterDate: Mon, 08 Apr 2024 16:01:50 +02:00

thermal: core: Relocate the struct thermal_governor definition

Notice that struct thermal_governor is only used by the thermal core
and so move its definition to thermal_core.h.

No functional impact.

Signed-off-by: Rafael J. Wysocki <[e-mail]>
Acked-by: Daniel Lezcano <[e-mail]>
Reviewed-by: Lukasz Luba <[e-mail]>
---
 drivers/thermal/thermal_core.h | 25 +++++++++++++++++++++++++
 include/linux/thermal.h        | 25 -------------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

Patch

diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index 9d3ef1e..b461d95 100644
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -23,6 +23,31 @@  struct thermal_trip_desc {
 };
 
 /**
+ * struct thermal_governor - structure that holds thermal governor information
+ * @name:	name of the governor
+ * @bind_to_tz: callback called when binding to a thermal zone.  If it
+ *		returns 0, the governor is bound to the thermal zone,
+ *		otherwise it fails.
+ * @unbind_from_tz:	callback called when a governor is unbound from a
+ *			thermal zone.
+ * @throttle:	callback called for every trip point even if temperature is
+ *		below the trip point temperature
+ * @update_tz:	callback called when thermal zone internals have changed, e.g.
+ *		thermal cooling instance was added/removed
+ * @governor_list:	node in thermal_governor_list (in thermal_core.c)
+ */
+struct thermal_governor {
+	const char *name;
+	int (*bind_to_tz)(struct thermal_zone_device *tz);
+	void (*unbind_from_tz)(struct thermal_zone_device *tz);
+	int (*throttle)(struct thermal_zone_device *tz,
+			const struct thermal_trip *trip);
+	void (*update_tz)(struct thermal_zone_device *tz,
+			  enum thermal_notify_event reason);
+	struct list_head	governor_list;
+};
+
+/**
  * struct thermal_zone_device - structure for a thermal zone
  * @id:		unique id number for each thermal zone
  * @type:	the thermal zone device type
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 62b1745..f1155c0 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -126,31 +126,6 @@  struct thermal_cooling_device {
 #endif
 };
 
-/**
- * struct thermal_governor - structure that holds thermal governor information
- * @name:	name of the governor
- * @bind_to_tz: callback called when binding to a thermal zone.  If it
- *		returns 0, the governor is bound to the thermal zone,
- *		otherwise it fails.
- * @unbind_from_tz:	callback called when a governor is unbound from a
- *			thermal zone.
- * @throttle:	callback called for every trip point even if temperature is
- *		below the trip point temperature
- * @update_tz:	callback called when thermal zone internals have changed, e.g.
- *		thermal cooling instance was added/removed
- * @governor_list:	node in thermal_governor_list (in thermal_core.c)
- */
-struct thermal_governor {
-	const char *name;
-	int (*bind_to_tz)(struct thermal_zone_device *tz);
-	void (*unbind_from_tz)(struct thermal_zone_device *tz);
-	int (*throttle)(struct thermal_zone_device *tz,
-			const struct thermal_trip *trip);
-	void (*update_tz)(struct thermal_zone_device *tz,
-			  enum thermal_notify_event reason);
-	struct list_head	governor_list;
-};
-
 /* Structure to define Thermal Zone parameters */
 struct thermal_zone_params {
 	const char *governor_name;