diff options
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
-rw-r--r-- | drivers/cpufreq/cpufreq.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 73d53d5a16ee..5a64f66d36e0 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
@@ -280,13 +280,6 @@ static void __cpufreq_notify_transition(struct cpufreq_policy *policy, | |||
280 | switch (state) { | 280 | switch (state) { |
281 | 281 | ||
282 | case CPUFREQ_PRECHANGE: | 282 | case CPUFREQ_PRECHANGE: |
283 | if (WARN(policy->transition_ongoing == | ||
284 | cpumask_weight(policy->cpus), | ||
285 | "In middle of another frequency transition\n")) | ||
286 | return; | ||
287 | |||
288 | policy->transition_ongoing++; | ||
289 | |||
290 | /* detect if the driver reported a value as "old frequency" | 283 | /* detect if the driver reported a value as "old frequency" |
291 | * which is not equal to what the cpufreq core thinks is | 284 | * which is not equal to what the cpufreq core thinks is |
292 | * "old frequency". | 285 | * "old frequency". |
@@ -306,12 +299,6 @@ static void __cpufreq_notify_transition(struct cpufreq_policy *policy, | |||
306 | break; | 299 | break; |
307 | 300 | ||
308 | case CPUFREQ_POSTCHANGE: | 301 | case CPUFREQ_POSTCHANGE: |
309 | if (WARN(!policy->transition_ongoing, | ||
310 | "No frequency transition in progress\n")) | ||
311 | return; | ||
312 | |||
313 | policy->transition_ongoing--; | ||
314 | |||
315 | adjust_jiffies(CPUFREQ_POSTCHANGE, freqs); | 302 | adjust_jiffies(CPUFREQ_POSTCHANGE, freqs); |
316 | pr_debug("FREQ: %lu - CPU: %lu", (unsigned long)freqs->new, | 303 | pr_debug("FREQ: %lu - CPU: %lu", (unsigned long)freqs->new, |
317 | (unsigned long)freqs->cpu); | 304 | (unsigned long)freqs->cpu); |
@@ -1657,8 +1644,6 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, | |||
1657 | 1644 | ||
1658 | if (cpufreq_disabled()) | 1645 | if (cpufreq_disabled()) |
1659 | return -ENODEV; | 1646 | return -ENODEV; |
1660 | if (policy->transition_ongoing) | ||
1661 | return -EBUSY; | ||
1662 | 1647 | ||
1663 | /* Make sure that target_freq is within supported range */ | 1648 | /* Make sure that target_freq is within supported range */ |
1664 | if (target_freq > policy->max) | 1649 | if (target_freq > policy->max) |