2023-05-25 14:08:39

by Daniel Lezcano

[permalink] [raw]
Subject: [PATCH 3/8] thermal/core: Reorder the headers inclusion

The next changes will move the thermal device structure inside the
thermal core code. Consequently, the traces must be included after
thermal_core.h as this one contains the thermal zone device structure
definition the traces need.

Reorder the inclusions.

No functional changes intended.

Signed-off-by: Daniel Lezcano <[email protected]>
---
drivers/thermal/gov_power_allocator.c | 6 +++---
drivers/thermal/thermal_core.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/thermal/gov_power_allocator.c b/drivers/thermal/gov_power_allocator.c
index d1c6ad92e5b4..6056ed15460b 100644
--- a/drivers/thermal/gov_power_allocator.c
+++ b/drivers/thermal/gov_power_allocator.c
@@ -11,12 +11,12 @@
#include <linux/slab.h>
#include <linux/thermal.h>

-#define CREATE_TRACE_POINTS
-#include "thermal_trace_ipa.h"
-
#define THERMAL_CORE_SUBSYS
#include "thermal_core.h"

+#define CREATE_TRACE_POINTS
+#include "thermal_trace_ipa.h"
+
#define INVALID_TRIP -1

#define FRAC_BITS 10
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 6bca97e27d59..afcd4197babd 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -21,13 +21,13 @@
#include <linux/of.h>
#include <linux/suspend.h>

-#define CREATE_TRACE_POINTS
-#include "thermal_trace.h"
-
#define THERMAL_CORE_SUBSYS
#include "thermal_core.h"
#include "thermal_hwmon.h"

+#define CREATE_TRACE_POINTS
+#include "thermal_trace.h"
+
static DEFINE_IDA(thermal_tz_ida);
static DEFINE_IDA(thermal_cdev_ida);

--
2.34.1