summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-02-18 20:41:36 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-09 16:41:09 +0300
commit47ebaac1f32dc606262be48a72f9cea6af376414 (patch)
tree9029e05e72c70383a205bfde274d4f3084c662f3
parent8c8f77fd0719a079450f59debed4f69ede825adb (diff)
downloadlinux-47ebaac1f32dc606262be48a72f9cea6af376414.tar.xz
cpufreq: governor: Relocate definitions of tuners structures
Move the definitions of struct od_dbs_tuners and struct cs_dbs_tuners from the common governor header to the ondemand and conservative governor code, respectively, as they don't need to be in the common header any more. No functional changes. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
-rw-r--r--drivers/cpufreq/cpufreq_conservative.c5
-rw-r--r--drivers/cpufreq/cpufreq_governor.h10
-rw-r--r--drivers/cpufreq/cpufreq_ondemand.h4
3 files changed, 9 insertions, 10 deletions
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c
index 5d1edc55aa63..bf4913f6453b 100644
--- a/drivers/cpufreq/cpufreq_conservative.c
+++ b/drivers/cpufreq/cpufreq_conservative.c
@@ -25,6 +25,11 @@ static inline struct cs_policy_dbs_info *to_dbs_info(struct policy_dbs_info *pol
return container_of(policy_dbs, struct cs_policy_dbs_info, policy_dbs);
}
+struct cs_dbs_tuners {
+ unsigned int down_threshold;
+ unsigned int freq_step;
+};
+
/* Conservative governor macros */
#define DEF_FREQUENCY_UP_THRESHOLD (80)
#define DEF_FREQUENCY_DOWN_THRESHOLD (20)
diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
index 58749da97099..ece70ab6bbfc 100644
--- a/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
@@ -148,16 +148,6 @@ struct cpu_dbs_info {
struct policy_dbs_info *policy_dbs;
};
-/* Per policy Governors sysfs tunables */
-struct od_dbs_tuners {
- unsigned int powersave_bias;
-};
-
-struct cs_dbs_tuners {
- unsigned int down_threshold;
- unsigned int freq_step;
-};
-
/* Common Governor data across policies */
struct dbs_governor {
struct cpufreq_governor gov;
diff --git a/drivers/cpufreq/cpufreq_ondemand.h b/drivers/cpufreq/cpufreq_ondemand.h
index 22403e4e0cb0..f0121db3cd9e 100644
--- a/drivers/cpufreq/cpufreq_ondemand.h
+++ b/drivers/cpufreq/cpufreq_ondemand.h
@@ -24,3 +24,7 @@ static inline struct od_policy_dbs_info *to_dbs_info(struct policy_dbs_info *pol
{
return container_of(policy_dbs, struct od_policy_dbs_info, policy_dbs);
}
+
+struct od_dbs_tuners {
+ unsigned int powersave_bias;
+};