cpufreq: Move ->get callback check outside of __cpufreq_get()

Currenly, __cpufreq_get() called by show_cpuinfo_cur_freq() will check
->get callback. That is needless since cpuinfo_cur_freq attribute will
not be created if ->get is not set. So let's drop it in __cpufreq_get().
Also keep this check in cpufreq_get().

Signed-off-by: Yue Hu <huyue2@yulong.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index df7d112fe6218f9ea7d9ee89c84bae43bf71d11b..92604afdeec44be3adac9c3ac42ec3742bb9d25b 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1585,7 +1585,7 @@ static unsigned int __cpufreq_get(struct cpufreq_policy *policy)
 {
        unsigned int ret_freq = 0;
 
-       if (unlikely(policy_is_inactive(policy)) || !cpufreq_driver->get)
+       if (unlikely(policy_is_inactive(policy)))
                return ret_freq;
 
        ret_freq = cpufreq_driver->get(policy->cpu);
@@ -1623,7 +1623,8 @@ unsigned int cpufreq_get(unsigned int cpu)
 
        if (policy) {
                down_read(&policy->rwsem);
-               ret_freq = __cpufreq_get(policy);
+               if (cpufreq_driver->get)
+                       ret_freq = __cpufreq_get(policy);
                up_read(&policy->rwsem);
 
                cpufreq_cpu_put(policy);