Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / cpufreq / unicore2-cpufreq.c

diff --git a/drivers/cpufreq/unicore2-cpufreq.c b/drivers/cpufreq/unicore2-cpufreq.c
index 653ae29..36cc330 100644 (file)
--- a/drivers/cpufreq/unicore2-cpufreq.c
+++ b/drivers/cpufreq/unicore2-cpufreq.c
@@ -11,6 +11,7 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
@@ -33,42 +34,34 @@ static int ucv2_verify_speed(struct cpufreq_policy *policy)
        return 0;
 }
 
-static unsigned int ucv2_getspeed(unsigned int cpu)
-{
-       struct clk *mclk = clk_get(NULL, "MAIN_CLK");
-
-       if (cpu)
-               return 0;
-       return clk_get_rate(mclk)/1000;
-}
-
 static int ucv2_target(struct cpufreq_policy *policy,
                         unsigned int target_freq,
                         unsigned int relation)
 {
-       unsigned int cur = ucv2_getspeed(0);
        struct cpufreq_freqs freqs;
-       struct clk *mclk = clk_get(NULL, "MAIN_CLK");
+       int ret;
 
-       cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+       freqs.old = policy->cur;
+       freqs.new = target_freq;
 
-       if (!clk_set_rate(mclk, target_freq * 1000)) {
-               freqs.old = cur;
-               freqs.new = target_freq;
-       }
-
-       cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
+       cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
+       ret = clk_set_rate(policy->mclk, target_freq * 1000);
+       cpufreq_notify_post_transition(policy, &freqs, ret);
 
-       return 0;
+       return ret;
 }
 
 static int __init ucv2_cpu_init(struct cpufreq_policy *policy)
 {
        if (policy->cpu != 0)
                return -EINVAL;
+
        policy->min = policy->cpuinfo.min_freq = 250000;
        policy->max = policy->cpuinfo.max_freq = 1000000;
        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+       policy->clk = clk_get(NULL, "MAIN_CLK");
+       if (IS_ERR(policy->clk))
+               return PTR_ERR(policy->clk);
        return 0;
 }
 
@@ -76,7 +69,7 @@ static struct cpufreq_driver ucv2_driver = {
        .flags          = CPUFREQ_STICKY,
        .verify         = ucv2_verify_speed,
        .target         = ucv2_target,
-       .get            = ucv2_getspeed,
+       .get            = cpufreq_generic_get,
        .init           = ucv2_cpu_init,
        .name           = "UniCore-II",
 };