From 47ebaac1f32dc606262be48a72f9cea6af376414 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 18 Feb 2016 18:41:36 +0100 Subject: 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 Acked-by: Viresh Kumar --- drivers/cpufreq/cpufreq_conservative.c | 5 +++++ drivers/cpufreq/cpufreq_governor.h | 10 ---------- drivers/cpufreq/cpufreq_ondemand.h | 4 ++++ 3 files changed, 9 insertions(+), 10 deletions(-) (limited to 'drivers/cpufreq') 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; +}; -- cgit v1.2.3