From: Rafael J. Wysocki <rjw@rjwysocki.net>
Date: Fri, 25 Oct 2013 20:36:40 +0000 (+0200)
Subject: Merge back earlier 'pm-cpufreq' material.
X-Git-Tag: v3.13-rc3~6^2~1^3~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ddee424fea2d269c2f402278d93165c7b92dc58;p=platform%2Fkernel%2Flinux-exynos.git

Merge back earlier 'pm-cpufreq' material.

Conflicts:
	drivers/cpufreq/omap-cpufreq.c
---

6ddee424fea2d269c2f402278d93165c7b92dc58
diff --cc drivers/cpufreq/omap-cpufreq.c
index 20190f5,58b2200..ac552d0
--- a/drivers/cpufreq/omap-cpufreq.c
+++ b/drivers/cpufreq/omap-cpufreq.c
@@@ -173,20 -166,14 +166,14 @@@ static int omap_cpu_init(struct cpufreq
  	if (IS_ERR(mpu_clk))
  		return PTR_ERR(mpu_clk);
  
- 	if (policy->cpu >= NR_CPUS) {
- 		result = -EINVAL;
- 		goto fail_ck;
- 	}
- 
- 	policy->cur = omap_getspeed(policy->cpu);
- 
- 	if (!freq_table)
+ 	if (!freq_table) {
 -		result = opp_init_cpufreq_table(mpu_dev, &freq_table);
 +		result = dev_pm_opp_init_cpufreq_table(mpu_dev, &freq_table);
- 
- 	if (result) {
- 		dev_err(mpu_dev, "%s: cpu%d: failed creating freq table[%d]\n",
+ 		if (result) {
+ 			dev_err(mpu_dev,
+ 				"%s: cpu%d: failed creating freq table[%d]\n",
  				__func__, policy->cpu, result);
- 		goto fail_ck;
+ 			goto fail;
+ 		}
  	}
  
  	atomic_inc_return(&freq_table_users);