Merge remote-tracking branch 'net-next/master'

[karo-tx-linux.git] / drivers / cpufreq / cris-artpec3-cpufreq.c

diff --git a/drivers/cpufreq/cris-artpec3-cpufreq.c b/drivers/cpufreq/cris-artpec3-cpufreq.c
index 4d88e4fa2ad42ca391eff5c2a616118e8695a64c..05fdc7e40257f96a83940d3fbd601d45f4e8e77a 100644 (file)
--- a/drivers/cpufreq/cris-artpec3-cpufreq.c
+++ b/drivers/cpufreq/cris-artpec3-cpufreq.c
@@ -71,13 +71,9 @@ static int cris_freq_target(struct cpufreq_policy *policy,
 
 static int cris_freq_cpu_init(struct cpufreq_policy *policy)
 {
-       /* cpuinfo and default policy values */
-       policy->cpuinfo.transition_latency = 1000000; /* 1ms */
-
-       return cpufreq_table_validate_and_show(policy, cris_freq_table);
+       return cpufreq_generic_init(policy, cris_freq_table, 1000000);
 }
 
-
 static struct cpufreq_driver cris_freq_driver = {
        .get    = cris_freq_get_cpu_frequency,
        .verify = cpufreq_generic_frequency_table_verify,