1 files changed, 10 insertions, 22 deletions

diff --git a/arch/arm/plat-omap/cpu-omap.c b/arch/arm/plat-omap/cpu-omap.c
index c0d63b0c61c9..d719c15daa55 100644
--- a/arch/arm/plat-omap/cpu-omap.c
+++ b/arch/arm/plat-omap/cpu-omap.c
@@ -33,43 +33,33 @@
 #define MPU_CLK         "virt_prcm_set"
 #endif
 
+static struct clk *mpu_clk;
+
 /* TODO: Add support for SDRAM timing changes */
 
 int omap_verify_speed(struct cpufreq_policy *policy)
 {
-        struct clk * mpu_clk;
-
         if (policy->cpu)
                 return -EINVAL;
 
         cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
                                      policy->cpuinfo.max_freq);
-        mpu_clk = clk_get(NULL, MPU_CLK);
-        if (IS_ERR(mpu_clk))
-                return PTR_ERR(mpu_clk);
+
         policy->min = clk_round_rate(mpu_clk, policy->min * 1000) / 1000;
         policy->max = clk_round_rate(mpu_clk, policy->max * 1000) / 1000;
         cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
                                      policy->cpuinfo.max_freq);
-        clk_put(mpu_clk);
-
         return 0;
 }
 
 unsigned int omap_getspeed(unsigned int cpu)
 {
-        struct clk * mpu_clk;
         unsigned long rate;
 
         if (cpu)
                 return 0;
 
-        mpu_clk = clk_get(NULL, MPU_CLK);
-        if (IS_ERR(mpu_clk))
-                return 0;
         rate = clk_get_rate(mpu_clk) / 1000;
-        clk_put(mpu_clk);
-
         return rate;
 }
 
@@ -77,14 +67,9 @@ static int omap_target(struct cpufreq_policy *policy,
                        unsigned int target_freq,
                        unsigned int relation)
 {
-        struct clk * mpu_clk;
         struct cpufreq_freqs freqs;
         int ret = 0;
 
-        mpu_clk = clk_get(NULL, MPU_CLK);
-        if (IS_ERR(mpu_clk))
-                return PTR_ERR(mpu_clk);
-
         freqs.old = omap_getspeed(0);
         freqs.new = clk_round_rate(mpu_clk, target_freq * 1000) / 1000;
         freqs.cpu = 0;
@@ -92,15 +77,12 @@ static int omap_target(struct cpufreq_policy *policy,
         cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
         ret = clk_set_rate(mpu_clk, target_freq * 1000);
         cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        clk_put(mpu_clk);
 
         return ret;
 }
 
 static int __init omap_cpu_init(struct cpufreq_policy *policy)
 {
-        struct clk * mpu_clk;
-
         mpu_clk = clk_get(NULL, MPU_CLK);
         if (IS_ERR(mpu_clk))
                 return PTR_ERR(mpu_clk);
@@ -111,17 +93,23 @@ static int __init omap_cpu_init(struct cpufreq_policy *policy)
         policy->cpuinfo.min_freq = clk_round_rate(mpu_clk, 0) / 1000;
         policy->cpuinfo.max_freq = clk_round_rate(mpu_clk, VERY_HI_RATE) / 1000;
         policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
-        clk_put(mpu_clk);
 
         return 0;
 }
 
+static int omap_cpu_exit(struct cpufreq_policy *policy)
+{
+        clk_put(mpu_clk);
+        return 0;
+}
+
 static struct cpufreq_driver omap_driver = {
         .flags          = CPUFREQ_STICKY,
         .verify         = omap_verify_speed,
         .target         = omap_target,
         .get            = omap_getspeed,
         .init           = omap_cpu_init,
+        .exit           = omap_cpu_exit,
         .name           = "omap",
 };