[PATCH v2 10/12] cpufreq: governor: Relocate definitions of tuners structures

From: Rafael J. Wysocki
Date: Thu Feb 18 2016 - 12:55:59 EST


From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Subject: [PATCH] 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@xxxxxxxxx>
---

This had to be update because of the update of [8/12] it depends on.

---
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(-)

Index: linux-pm/drivers/cpufreq/cpufreq_conservative.c
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_conservative.c
+++ linux-pm/drivers/cpufreq/cpufreq_conservative.c
@@ -25,6 +25,11 @@ static inline struct cs_policy_dbs_info
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)
Index: linux-pm/drivers/cpufreq/cpufreq_governor.h
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_governor.h
+++ linux-pm/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;
Index: linux-pm/drivers/cpufreq/cpufreq_ondemand.h
===================================================================
--- linux-pm.orig/drivers/cpufreq/cpufreq_ondemand.h
+++ linux-pm/drivers/cpufreq/cpufreq_ondemand.h
@@ -24,3 +24,7 @@ static inline struct od_policy_dbs_info
{
return container_of(policy_dbs, struct od_policy_dbs_info, policy_dbs);
}
+
+struct od_dbs_tuners {
+ unsigned int powersave_bias;
+};