|
@@ -1546,23 +1546,16 @@ static unsigned int __cpufreq_get(unsigned int cpu)
|
|
|
*/
|
|
|
unsigned int cpufreq_get(unsigned int cpu)
|
|
|
{
|
|
|
- struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu);
|
|
|
+ struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
|
|
|
unsigned int ret_freq = 0;
|
|
|
|
|
|
- if (cpufreq_disabled() || !cpufreq_driver)
|
|
|
- return -ENOENT;
|
|
|
-
|
|
|
- BUG_ON(!policy);
|
|
|
-
|
|
|
- if (!down_read_trylock(&cpufreq_rwsem))
|
|
|
- return 0;
|
|
|
-
|
|
|
- down_read(&policy->rwsem);
|
|
|
-
|
|
|
- ret_freq = __cpufreq_get(cpu);
|
|
|
+ if (policy) {
|
|
|
+ down_read(&policy->rwsem);
|
|
|
+ ret_freq = __cpufreq_get(cpu);
|
|
|
+ up_read(&policy->rwsem);
|
|
|
|
|
|
- up_read(&policy->rwsem);
|
|
|
- up_read(&cpufreq_rwsem);
|
|
|
+ cpufreq_cpu_put(policy);
|
|
|
+ }
|
|
|
|
|
|
return ret_freq;
|
|
|
}
|