Commit 4db7c34c authored Apr 19, 2019 by Yue Hu Committed by Rafael J. Wysocki Apr 23, 2019

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>

parent b23aa311

drivers/cpufreq/cpufreq.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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,6 +1623,7 @@ unsigned int cpufreq_get(unsigned int cpu)

		if (policy) {
		down_read(&policy->rwsem);
		if (cpufreq_driver->get)
		ret_freq = __cpufreq_get(policy);
		up_read(&policy->rwsem);

Admin message