1 files changed, 7 insertions, 50 deletions

diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c
index 7bc3c44d34e2..a43609218105 100644
--- a/drivers/cpufreq/loongson2_cpufreq.c
+++ b/drivers/cpufreq/loongson2_cpufreq.c
@@ -53,51 +53,24 @@ static unsigned int loongson2_cpufreq_get(unsigned int cpu)
  * Here we notify other drivers of the proposed change and the final change.
  */
 static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
-                                     unsigned int target_freq,
-                                     unsigned int relation)
+                                     unsigned int index)
 {
         unsigned int cpu = policy->cpu;
-        unsigned int newstate = 0;
         cpumask_t cpus_allowed;
-        struct cpufreq_freqs freqs;
         unsigned int freq;
 
         cpus_allowed = current->cpus_allowed;
         set_cpus_allowed_ptr(current, cpumask_of(cpu));
 
-        if (cpufreq_frequency_table_target
-            (policy, &loongson2_clockmod_table[0], target_freq, relation,
-             &newstate))
-                return -EINVAL;
-
         freq =
             ((cpu_clock_freq / 1000) *
-             loongson2_clockmod_table[newstate].driver_data) / 8;
-        if (freq < policy->min || freq > policy->max)
-                return -EINVAL;
-
-        pr_debug("cpufreq: requested frequency %u Hz\n", target_freq * 1000);
-
-        freqs.old = loongson2_cpufreq_get(cpu);
-        freqs.new = freq;
-        freqs.flags = 0;
-
-        if (freqs.new == freqs.old)
-                return 0;
-
-        /* notifiers */
-        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+             loongson2_clockmod_table[index].driver_data) / 8;
 
         set_cpus_allowed_ptr(current, &cpus_allowed);
 
         /* setting the cpu frequency */
         clk_set_rate(cpuclk, freq);
 
-        /* notifiers */
-        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
-
-        pr_debug("cpufreq: set frequency %u kHz\n", freq);
-
         return 0;
 }
 
@@ -131,40 +104,24 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
                 return ret;
         }
 
-        policy->cur = loongson2_cpufreq_get(policy->cpu);
-
-        cpufreq_frequency_table_get_attr(&loongson2_clockmod_table[0],
-                                         policy->cpu);
-
-        return cpufreq_frequency_table_cpuinfo(policy,
-                                            &loongson2_clockmod_table[0]);
-}
-
-static int loongson2_cpufreq_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy,
-                                              &loongson2_clockmod_table[0]);
+        return cpufreq_generic_init(policy, &loongson2_clockmod_table[0], 0);
 }
 
 static int loongson2_cpufreq_exit(struct cpufreq_policy *policy)
 {
+        cpufreq_frequency_table_put_attr(policy->cpu);
         clk_put(cpuclk);
         return 0;
 }
 
-static struct freq_attr *loongson2_table_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
 static struct cpufreq_driver loongson2_cpufreq_driver = {
         .name = "loongson2",
         .init = loongson2_cpufreq_cpu_init,
-        .verify = loongson2_cpufreq_verify,
-        .target = loongson2_cpufreq_target,
+        .verify = cpufreq_generic_frequency_table_verify,
+        .target_index = loongson2_cpufreq_target,
         .get = loongson2_cpufreq_get,
         .exit = loongson2_cpufreq_exit,
-        .attr = loongson2_table_attr,
+        .attr = cpufreq_generic_attr,
 };
 
 static struct platform_device_id platform_device_ids[] = {