aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/cpufreq/pmac32-cpufreq.c14
-rw-r--r--drivers/cpufreq/pmac64-cpufreq.c14
2 files changed, 4 insertions, 24 deletions
diff --git a/drivers/cpufreq/pmac32-cpufreq.c b/drivers/cpufreq/pmac32-cpufreq.c
index 470b5553bb66..8715ab99d80e 100644
--- a/drivers/cpufreq/pmac32-cpufreq.c
+++ b/drivers/cpufreq/pmac32-cpufreq.c
@@ -86,11 +86,6 @@ static struct cpufreq_frequency_table pmac_cpu_freqs[] = {
86 {0, CPUFREQ_TABLE_END}, 86 {0, CPUFREQ_TABLE_END},
87}; 87};
88 88
89static struct freq_attr* pmac_cpu_freqs_attr[] = {
90 &cpufreq_freq_attr_scaling_available_freqs,
91 NULL,
92};
93
94static inline void local_delay(unsigned long ms) 89static inline void local_delay(unsigned long ms)
95{ 90{
96 if (no_schedule) 91 if (no_schedule)
@@ -378,11 +373,6 @@ static unsigned int pmac_cpufreq_get_speed(unsigned int cpu)
378 return cur_freq; 373 return cur_freq;
379} 374}
380 375
381static int pmac_cpufreq_verify(struct cpufreq_policy *policy)
382{
383 return cpufreq_frequency_table_verify(policy, pmac_cpu_freqs);
384}
385
386static int pmac_cpufreq_target( struct cpufreq_policy *policy, 376static int pmac_cpufreq_target( struct cpufreq_policy *policy,
387 unsigned int target_freq, 377 unsigned int target_freq,
388 unsigned int relation) 378 unsigned int relation)
@@ -468,14 +458,14 @@ static int pmac_cpufreq_resume(struct cpufreq_policy *policy)
468} 458}
469 459
470static struct cpufreq_driver pmac_cpufreq_driver = { 460static struct cpufreq_driver pmac_cpufreq_driver = {
471 .verify = pmac_cpufreq_verify, 461 .verify = cpufreq_generic_frequency_table_verify,
472 .target = pmac_cpufreq_target, 462 .target = pmac_cpufreq_target,
473 .get = pmac_cpufreq_get_speed, 463 .get = pmac_cpufreq_get_speed,
474 .init = pmac_cpufreq_cpu_init, 464 .init = pmac_cpufreq_cpu_init,
475 .suspend = pmac_cpufreq_suspend, 465 .suspend = pmac_cpufreq_suspend,
476 .resume = pmac_cpufreq_resume, 466 .resume = pmac_cpufreq_resume,
477 .flags = CPUFREQ_PM_NO_WARN, 467 .flags = CPUFREQ_PM_NO_WARN,
478 .attr = pmac_cpu_freqs_attr, 468 .attr = cpufreq_generic_attr,
479 .name = "powermac", 469 .name = "powermac",
480}; 470};
481 471
diff --git a/drivers/cpufreq/pmac64-cpufreq.c b/drivers/cpufreq/pmac64-cpufreq.c
index 41fa89e4d9d8..e853b852b34b 100644
--- a/drivers/cpufreq/pmac64-cpufreq.c
+++ b/drivers/cpufreq/pmac64-cpufreq.c
@@ -70,11 +70,6 @@ static struct cpufreq_frequency_table g5_cpu_freqs[] = {
70 {0, CPUFREQ_TABLE_END}, 70 {0, CPUFREQ_TABLE_END},
71}; 71};
72 72
73static struct freq_attr* g5_cpu_freqs_attr[] = {
74 &cpufreq_freq_attr_scaling_available_freqs,
75 NULL,
76};
77
78/* Power mode data is an array of the 32 bits PCR values to use for 73/* Power mode data is an array of the 32 bits PCR values to use for
79 * the various frequencies, retrieved from the device-tree 74 * the various frequencies, retrieved from the device-tree
80 */ 75 */
@@ -317,11 +312,6 @@ static int g5_pfunc_query_freq(void)
317 * Common interface to the cpufreq core 312 * Common interface to the cpufreq core
318 */ 313 */
319 314
320static int g5_cpufreq_verify(struct cpufreq_policy *policy)
321{
322 return cpufreq_frequency_table_verify(policy, g5_cpu_freqs);
323}
324
325static int g5_cpufreq_target(struct cpufreq_policy *policy, 315static int g5_cpufreq_target(struct cpufreq_policy *policy,
326 unsigned int target_freq, unsigned int relation) 316 unsigned int target_freq, unsigned int relation)
327{ 317{
@@ -372,10 +362,10 @@ static struct cpufreq_driver g5_cpufreq_driver = {
372 .name = "powermac", 362 .name = "powermac",
373 .flags = CPUFREQ_CONST_LOOPS, 363 .flags = CPUFREQ_CONST_LOOPS,
374 .init = g5_cpufreq_cpu_init, 364 .init = g5_cpufreq_cpu_init,
375 .verify = g5_cpufreq_verify, 365 .verify = cpufreq_generic_frequency_table_verify,
376 .target = g5_cpufreq_target, 366 .target = g5_cpufreq_target,
377 .get = g5_cpufreq_get_speed, 367 .get = g5_cpufreq_get_speed,
378 .attr = g5_cpu_freqs_attr, 368 .attr = cpufreq_generic_attr,
379}; 369};
380 370
381 371