diff options
-rw-r--r-- | arch/arm/mach-integrator/cpu.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/cpufreq-pxa2xx.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-pxa/cpufreq-pxa3xx.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/cpu-sa1100.c | 1 | ||||
-rw-r--r-- | arch/avr32/mach-at32ap/cpufreq.c | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-common/cpufreq.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/mach-a3/cpufreq.c | 1 | ||||
-rw-r--r-- | arch/cris/arch-v32/mach-fs/cpufreq.c | 1 | ||||
-rw-r--r-- | arch/sparc64/kernel/us3_cpufreq.c | 1 |
9 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c index e4f72d202cc0..44d4c2e8207b 100644 --- a/arch/arm/mach-integrator/cpu.c +++ b/arch/arm/mach-integrator/cpu.c | |||
@@ -184,7 +184,6 @@ static int integrator_cpufreq_init(struct cpufreq_policy *policy) | |||
184 | { | 184 | { |
185 | 185 | ||
186 | /* set default policy and cpuinfo */ | 186 | /* set default policy and cpuinfo */ |
187 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
188 | policy->cpuinfo.max_freq = 160000; | 187 | policy->cpuinfo.max_freq = 160000; |
189 | policy->cpuinfo.min_freq = 12000; | 188 | policy->cpuinfo.min_freq = 12000; |
190 | policy->cpuinfo.transition_latency = 1000000; /* 1 ms, assumed */ | 189 | policy->cpuinfo.transition_latency = 1000000; /* 1 ms, assumed */ |
diff --git a/arch/arm/mach-pxa/cpufreq-pxa2xx.c b/arch/arm/mach-pxa/cpufreq-pxa2xx.c index d82528e74bd0..1f272ea83f36 100644 --- a/arch/arm/mach-pxa/cpufreq-pxa2xx.c +++ b/arch/arm/mach-pxa/cpufreq-pxa2xx.c | |||
@@ -335,9 +335,6 @@ static __init int pxa_cpufreq_init(struct cpufreq_policy *policy) | |||
335 | pxa27x_guess_max_freq(); | 335 | pxa27x_guess_max_freq(); |
336 | 336 | ||
337 | /* set default policy and cpuinfo */ | 337 | /* set default policy and cpuinfo */ |
338 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
339 | if (cpu_is_pxa25x()) | ||
340 | policy->policy = CPUFREQ_POLICY_PERFORMANCE; | ||
341 | policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ | 338 | policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ |
342 | policy->cur = get_clk_frequency_khz(0); /* current freq */ | 339 | policy->cur = get_clk_frequency_khz(0); /* current freq */ |
343 | policy->min = policy->max = policy->cur; | 340 | policy->min = policy->max = policy->cur; |
diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/arch/arm/mach-pxa/cpufreq-pxa3xx.c index 1ea0c9c0adaf..968c8309ec37 100644 --- a/arch/arm/mach-pxa/cpufreq-pxa3xx.c +++ b/arch/arm/mach-pxa/cpufreq-pxa3xx.c | |||
@@ -210,7 +210,6 @@ static __init int pxa3xx_cpufreq_init(struct cpufreq_policy *policy) | |||
210 | int ret = -EINVAL; | 210 | int ret = -EINVAL; |
211 | 211 | ||
212 | /* set default policy and cpuinfo */ | 212 | /* set default policy and cpuinfo */ |
213 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
214 | policy->cpuinfo.min_freq = 104000; | 213 | policy->cpuinfo.min_freq = 104000; |
215 | policy->cpuinfo.max_freq = (cpu_is_pxa320()) ? 806000 : 624000; | 214 | policy->cpuinfo.max_freq = (cpu_is_pxa320()) ? 806000 : 624000; |
216 | policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ | 215 | policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */ |
diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c index f7fa03478efd..244d5956312c 100644 --- a/arch/arm/mach-sa1100/cpu-sa1100.c +++ b/arch/arm/mach-sa1100/cpu-sa1100.c | |||
@@ -224,7 +224,6 @@ static int __init sa1100_cpu_init(struct cpufreq_policy *policy) | |||
224 | if (policy->cpu != 0) | 224 | if (policy->cpu != 0) |
225 | return -EINVAL; | 225 | return -EINVAL; |
226 | policy->cur = policy->min = policy->max = sa11x0_getspeed(0); | 226 | policy->cur = policy->min = policy->max = sa11x0_getspeed(0); |
227 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
228 | policy->cpuinfo.min_freq = 59000; | 227 | policy->cpuinfo.min_freq = 59000; |
229 | policy->cpuinfo.max_freq = 287000; | 228 | policy->cpuinfo.max_freq = 287000; |
230 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | 229 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; |
diff --git a/arch/avr32/mach-at32ap/cpufreq.c b/arch/avr32/mach-at32ap/cpufreq.c index 5dd8d25428bf..d84efe4984ab 100644 --- a/arch/avr32/mach-at32ap/cpufreq.c +++ b/arch/avr32/mach-at32ap/cpufreq.c | |||
@@ -87,7 +87,6 @@ static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy) | |||
87 | policy->cur = at32_get_speed(0); | 87 | policy->cur = at32_get_speed(0); |
88 | policy->min = policy->cpuinfo.min_freq; | 88 | policy->min = policy->cpuinfo.min_freq; |
89 | policy->max = policy->cpuinfo.max_freq; | 89 | policy->max = policy->cpuinfo.max_freq; |
90 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
91 | 90 | ||
92 | printk("cpufreq: AT32AP CPU frequency driver\n"); | 91 | printk("cpufreq: AT32AP CPU frequency driver\n"); |
93 | 92 | ||
diff --git a/arch/blackfin/mach-common/cpufreq.c b/arch/blackfin/mach-common/cpufreq.c index 75cdad291e88..c22c47b60127 100644 --- a/arch/blackfin/mach-common/cpufreq.c +++ b/arch/blackfin/mach-common/cpufreq.c | |||
@@ -158,8 +158,6 @@ static int __init __bfin_cpu_init(struct cpufreq_policy *policy) | |||
158 | dpm_state_table[index].tscale); | 158 | dpm_state_table[index].tscale); |
159 | } | 159 | } |
160 | 160 | ||
161 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
162 | |||
163 | policy->cpuinfo.transition_latency = (bfin_read_PLL_LOCKCNT() / (sclk / 1000000)) * 1000; | 161 | policy->cpuinfo.transition_latency = (bfin_read_PLL_LOCKCNT() / (sclk / 1000000)) * 1000; |
164 | /*Now ,only support one cpu */ | 162 | /*Now ,only support one cpu */ |
165 | policy->cur = cclk; | 163 | policy->cur = cclk; |
diff --git a/arch/cris/arch-v32/mach-a3/cpufreq.c b/arch/cris/arch-v32/mach-a3/cpufreq.c index 8e5a3cab8ad7..ee391ecb5bc9 100644 --- a/arch/cris/arch-v32/mach-a3/cpufreq.c +++ b/arch/cris/arch-v32/mach-a3/cpufreq.c | |||
@@ -85,7 +85,6 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy) | |||
85 | int result; | 85 | int result; |
86 | 86 | ||
87 | /* cpuinfo and default policy values */ | 87 | /* cpuinfo and default policy values */ |
88 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
89 | policy->cpuinfo.transition_latency = 1000000; /* 1ms */ | 88 | policy->cpuinfo.transition_latency = 1000000; /* 1ms */ |
90 | policy->cur = cris_freq_get_cpu_frequency(0); | 89 | policy->cur = cris_freq_get_cpu_frequency(0); |
91 | 90 | ||
diff --git a/arch/cris/arch-v32/mach-fs/cpufreq.c b/arch/cris/arch-v32/mach-fs/cpufreq.c index d57631c0d8d1..58bd71e5bda9 100644 --- a/arch/cris/arch-v32/mach-fs/cpufreq.c +++ b/arch/cris/arch-v32/mach-fs/cpufreq.c | |||
@@ -81,7 +81,6 @@ static int cris_freq_cpu_init(struct cpufreq_policy *policy) | |||
81 | int result; | 81 | int result; |
82 | 82 | ||
83 | /* cpuinfo and default policy values */ | 83 | /* cpuinfo and default policy values */ |
84 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
85 | policy->cpuinfo.transition_latency = 1000000; /* 1ms */ | 84 | policy->cpuinfo.transition_latency = 1000000; /* 1ms */ |
86 | policy->cur = cris_freq_get_cpu_frequency(0); | 85 | policy->cur = cris_freq_get_cpu_frequency(0); |
87 | 86 | ||
diff --git a/arch/sparc64/kernel/us3_cpufreq.c b/arch/sparc64/kernel/us3_cpufreq.c index 47e3acafb5be..365b6464e2ce 100644 --- a/arch/sparc64/kernel/us3_cpufreq.c +++ b/arch/sparc64/kernel/us3_cpufreq.c | |||
@@ -183,7 +183,6 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy) | |||
183 | table[3].index = 0; | 183 | table[3].index = 0; |
184 | table[3].frequency = CPUFREQ_TABLE_END; | 184 | table[3].frequency = CPUFREQ_TABLE_END; |
185 | 185 | ||
186 | policy->governor = CPUFREQ_DEFAULT_GOVERNOR; | ||
187 | policy->cpuinfo.transition_latency = 0; | 186 | policy->cpuinfo.transition_latency = 0; |
188 | policy->cur = clock_tick; | 187 | policy->cur = clock_tick; |
189 | 188 | ||