diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-08-28 20:58:16 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-08-28 20:58:16 +0200 |
| commit | ef7d960403ecd87276e12b69c26bf0fdd5f21a0e (patch) | |
| tree | 5d5030f349c107dc3098d05a311411c776439df5 /include | |
| parent | e3eb6e8fba65094328b8dca635d00de74ba75b45 (diff) | |
| parent | 30b8e6b22fd0f7a56911e69c681e92532e72e3b6 (diff) | |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
cpufreq: Use WARN_ON_ONCE() for invalid relation
cpufreq: No need to verify cpufreq_driver in show_scaling_cur_freq()
Documentation: fix pm/intel_pstate build warning and wording
cpufreq: replace cpu_logical_map() with read_cpuid_mpir()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpufreq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 8f141d4c859c..a911e5d06845 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -956,8 +956,8 @@ static inline int cpufreq_frequency_table_target(struct cpufreq_policy *policy, case CPUFREQ_RELATION_C: return cpufreq_table_find_index_c(policy, target_freq); default: - pr_err("%s: Invalid relation: %d\n", __func__, relation); - return -EINVAL; + WARN_ON_ONCE(1); + return 0; } } |