[cpu/gpu]_cooling: move get_static_t declaration in thermal.h

To avoid redefenition warning.
Signed-off-by: Yaroslav Furman <yaro330@gmail.com>

diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h
index 840fd18ba18e72632ce355629ab79724d2248097..2c915b1f36fd804b1654ec783da38b0648b148ad 100644 (file)
--- a/include/linux/cpu_cooling.h
+++ b/include/linux/cpu_cooling.h
@@ -28,9 +28,6 @@
 #include <linux/thermal.h>
 #include <linux/cpumask.h>
 
-typedef int (*get_static_t)(cpumask_t *cpumask, int interval,
-                           unsigned long voltage, u32 *power);
-
 /**
  * struct cpufreq_cooling_device - data for cooling device with cpufreq
  * @id: unique integer value corresponding to each cpufreq_cooling_device

diff --git a/include/linux/gpu_cooling.h b/include/linux/gpu_cooling.h
index ff29dde41f7b2fbfe27c041e1741eababb071aae..b644d63137d76bb8fee5e311e918a89cf8f863bb 100644 (file)
--- a/include/linux/gpu_cooling.h
+++ b/include/linux/gpu_cooling.h
@@ -28,9 +28,6 @@
 #include <linux/thermal.h>
 #include <linux/cpumask.h>
 
-typedef int (*get_static_t)(cpumask_t *cpumask, int interval,
-                           unsigned long voltage, u32 *power);
-
 #ifdef CONFIG_GPU_THERMAL
 /**
  * gpufreq_cooling_register - function to create gpufreq cooling device.

diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index 80e567ab66e714bbea676e756ce22397cbbe3ceb..9c6d4ce349f2f82fdcbe6e1b2849ce22468eb084 100644 (file)
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -75,6 +75,10 @@ struct thermal_zone_device;
 struct thermal_cooling_device;
 struct thermal_instance;
 
+/* From cpu_cooling.h and gpu_cooling.h */
+typedef int (*get_static_t)(cpumask_t *cpumask, int interval,
+                           unsigned long voltage, u32 *power);
+
 #ifdef CONFIG_SEC_DEBUG_HW_PARAM
 enum thermal_zone_devices {
        THERMAL_ZONE_MNGS = 0,