Merge ../linus

[pandora-kernel.git] / drivers / cpufreq / freq_table.c

diff --git a/drivers/cpufreq/freq_table.c b/drivers/cpufreq/freq_table.c
index ba460bd..551f4cc 100644 (file)
--- a/drivers/cpufreq/freq_table.c
+++ b/drivers/cpufreq/freq_table.c
@@ -20,7 +20,7 @@ int cpufreq_frequency_table_cpuinfo(struct cpufreq_policy *policy,
 {
        unsigned int min_freq = ~0;
        unsigned int max_freq = 0;
-       unsigned int i = 0;
+       unsigned int i;
 
        for (i=0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
                unsigned int freq = table[i].frequency;
@@ -51,7 +51,7 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
                                   struct cpufreq_frequency_table *table)
 {
        unsigned int next_larger = ~0;
-       unsigned int i = 0;
+       unsigned int i;
        unsigned int count = 0;
 
        dprintk("request for verification of policy (%u - %u kHz) for cpu %u\n", policy->min, policy->max, policy->cpu);
@@ -59,9 +59,8 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
        if (!cpu_online(policy->cpu))
                return -EINVAL;
 
-       cpufreq_verify_within_limits(policy, 
-                                    policy->cpuinfo.min_freq, 
-                                    policy->cpuinfo.max_freq);
+       cpufreq_verify_within_limits(policy,
+                                    policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);
 
        for (i=0; (table[i].frequency != CPUFREQ_TABLE_END); i++) {
                unsigned int freq = table[i].frequency;
@@ -76,9 +75,8 @@ int cpufreq_frequency_table_verify(struct cpufreq_policy *policy,
        if (!count)
                policy->max = next_larger;
 
-       cpufreq_verify_within_limits(policy, 
-                                    policy->cpuinfo.min_freq, 
-                                    policy->cpuinfo.max_freq);
+       cpufreq_verify_within_limits(policy,
+                                    policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);
 
        dprintk("verification lead to (%u - %u kHz) for cpu %u\n", policy->min, policy->max, policy->cpu);
 
@@ -93,20 +91,24 @@ int cpufreq_frequency_table_target(struct cpufreq_policy *policy,
                                   unsigned int relation,
                                   unsigned int *index)
 {
-       struct cpufreq_frequency_table optimal = { .index = ~0, };
-       struct cpufreq_frequency_table suboptimal = { .index = ~0, };
+       struct cpufreq_frequency_table optimal = {
+               .index = ~0,
+               .frequency = 0,
+       };
+       struct cpufreq_frequency_table suboptimal = {
+               .index = ~0,
+               .frequency = 0,
+       };
        unsigned int i;
 
        dprintk("request for target %u kHz (relation: %u) for cpu %u\n", target_freq, relation, policy->cpu);
 
        switch (relation) {
        case CPUFREQ_RELATION_H:
-               optimal.frequency = 0;
                suboptimal.frequency = ~0;
                break;
        case CPUFREQ_RELATION_L:
                optimal.frequency = ~0;
-               suboptimal.frequency = 0;
                break;
        }
 
@@ -199,7 +201,7 @@ EXPORT_SYMBOL_GPL(cpufreq_freq_attr_scaling_available_freqs);
  * if you use these, you must assure that the frequency table is valid
  * all the time between get_attr and put_attr!
  */
-void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table, 
+void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table,
                                      unsigned int cpu)
 {
        dprintk("setting show_table for cpu %u to %p\n", cpu, table);