Merge tag 'trace-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[mirror_ubuntu-zesty-kernel.git] / include / linux / devfreq_cooling.h

diff --git a/include/linux/devfreq_cooling.h b/include/linux/devfreq_cooling.h
index 7adf6cc4b305d93fc5510b433b025165df4adf62..c35d0c0e0ada7a4e99363d217a86fc4cad8dafaf 100644 (file)
--- a/include/linux/devfreq_cooling.h
+++ b/include/linux/devfreq_cooling.h
@@ -20,7 +20,6 @@
 #include <linux/devfreq.h>
 #include <linux/thermal.h>
 
-#ifdef CONFIG_DEVFREQ_THERMAL
 
 /**
  * struct devfreq_cooling_power - Devfreq cooling power ops
@@ -37,12 +36,16 @@
  *                     @dyn_power_coeff * frequency * voltage^2
  */
 struct devfreq_cooling_power {
-       unsigned long (*get_static_power)(unsigned long voltage);
-       unsigned long (*get_dynamic_power)(unsigned long freq,
+       unsigned long (*get_static_power)(struct devfreq *devfreq,
+                                         unsigned long voltage);
+       unsigned long (*get_dynamic_power)(struct devfreq *devfreq,
+                                          unsigned long freq,
                                           unsigned long voltage);
        unsigned long dyn_power_coeff;
 };
 
+#ifdef CONFIG_DEVFREQ_THERMAL
+
 struct thermal_cooling_device *
 of_devfreq_cooling_register_power(struct device_node *np, struct devfreq *df,
                                  struct devfreq_cooling_power *dfc_power);