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

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

diff --git a/drivers/cpufreq/spear-cpufreq.c b/drivers/cpufreq/spear-cpufreq.c
index aacdb615e4ed6ca11fb8b1ee06814819a9f6b5a8..8841366a2068e2c41898daf982997820a10ed725 100644 (file)
--- a/drivers/cpufreq/spear-cpufreq.c
+++ b/drivers/cpufreq/spear-cpufreq.c
@@ -108,7 +108,7 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy,
                unsigned int target_freq, unsigned int relation)
 {
        struct cpufreq_freqs freqs;
-       unsigned long newfreq;
+       long newfreq;
        struct clk *srcclk;
        int index, ret, mult = 1;
 
@@ -171,18 +171,8 @@ static int spear_cpufreq_target(struct cpufreq_policy *policy,
 
 static int spear_cpufreq_init(struct cpufreq_policy *policy)
 {
-       int ret;
-
-       ret = cpufreq_table_validate_and_show(policy, spear_cpufreq.freq_tbl);
-       if (ret) {
-               pr_err("cpufreq_table_validate_and_show() failed");
-               return ret;
-       }
-
-       policy->cpuinfo.transition_latency = spear_cpufreq.transition_latency;
-       cpumask_setall(policy->cpus);
-
-       return 0;
+       return cpufreq_generic_init(policy, spear_cpufreq.freq_tbl,
+                       spear_cpufreq.transition_latency);
 }
 
 static struct cpufreq_driver spear_cpufreq_driver = {