diff options
author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-01-27 03:36:07 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-03 17:26:02 -0500 |
commit | 1e63eaf0c45f0ac733ef2818cd93e3e9047ef1c5 (patch) | |
tree | fca60dba177f10eb05d2d8f1f27ae9cc8dadb18f | |
parent | 6ffae8c06fab058d6c3f8ecb7f921327721034e7 (diff) |
cpufreq: Drop cpufreq_disabled() check from cpufreq_cpu_{get|put}()
When cpufreq is disabled, the per-cpu variable would have been set to
NULL. Remove this unnecessary check.
[ Changelog from Saravana Kannan. ]
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Saravana Kannan <skannan@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/cpufreq/cpufreq.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 2b181f75da15..158709418e21 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
@@ -203,7 +203,7 @@ struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu) | |||
203 | struct cpufreq_policy *policy = NULL; | 203 | struct cpufreq_policy *policy = NULL; |
204 | unsigned long flags; | 204 | unsigned long flags; |
205 | 205 | ||
206 | if (cpufreq_disabled() || (cpu >= nr_cpu_ids)) | 206 | if (cpu >= nr_cpu_ids) |
207 | return NULL; | 207 | return NULL; |
208 | 208 | ||
209 | if (!down_read_trylock(&cpufreq_rwsem)) | 209 | if (!down_read_trylock(&cpufreq_rwsem)) |
@@ -230,9 +230,6 @@ EXPORT_SYMBOL_GPL(cpufreq_cpu_get); | |||
230 | 230 | ||
231 | void cpufreq_cpu_put(struct cpufreq_policy *policy) | 231 | void cpufreq_cpu_put(struct cpufreq_policy *policy) |
232 | { | 232 | { |
233 | if (cpufreq_disabled()) | ||
234 | return; | ||
235 | |||
236 | kobject_put(&policy->kobj); | 233 | kobject_put(&policy->kobj); |
237 | up_read(&cpufreq_rwsem); | 234 | up_read(&cpufreq_rwsem); |
238 | } | 235 | } |