cpufreq: Remove ->resolve_freq()

Commit e3c062360870 ("cpufreq: add cpufreq_driver_resolve_freq()")
introduced this callback, back in 2016, for drivers that provide the
->target() callback.

The kernel hasn't seen a single user of it in the past 5 years and
it is not likely to be used any time soon.

Remove it for now.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
[ rjw: Changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/Documentation/cpu-freq/cpu-drivers.rst b/Documentation/cpu-freq/cpu-drivers.rst
index 74fac797c3969bac4a27b2981356f536653c8e2f..d84ededb66f92a234395be70f8fcdec1412aaed7 100644 (file)
--- a/Documentation/cpu-freq/cpu-drivers.rst
+++ b/Documentation/cpu-freq/cpu-drivers.rst
@@ -58,9 +58,6 @@ And optionally
 
  .driver_data - cpufreq driver specific data.
 
- .resolve_freq - Returns the most appropriate frequency for a target
- frequency. Doesn't change the frequency though.
-
  .get_intermediate and target_intermediate - Used to switch to stable
  frequency while changing CPU frequency.
 

diff --git a/Documentation/translations/zh_CN/cpu-freq/cpu-drivers.rst b/Documentation/translations/zh_CN/cpu-freq/cpu-drivers.rst
index 9570e9c9e939765a3f2836eb2b4f219801f38f19..5ae9cfa2ec55736689dfe164c85080e7ad684016 100644 (file)
--- a/Documentation/translations/zh_CN/cpu-freq/cpu-drivers.rst
+++ b/Documentation/translations/zh_CN/cpu-freq/cpu-drivers.rst
@@ -64,8 +64,6 @@ CPUfreq核心层注册一个cpufreq_driver结构体。
 
  .driver_data - cpufreq驱动程序的特定数据。
 
- .resolve_freq - 返回最适合目标频率的频率。不过并不能改变频率。
-
  .get_intermediate 和 target_intermediate - 用于在改变CPU频率时切换到稳定
  的频率。
 

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 8271ed1a494780b4c415fe6866a6f67b6aa6fbb8..45f3416988f1a45d42bdc516105caa82702483e6 100644 (file)
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -527,22 +527,17 @@ EXPORT_SYMBOL_GPL(cpufreq_disable_fast_switch);
 static unsigned int __resolve_freq(struct cpufreq_policy *policy,
                unsigned int target_freq, unsigned int relation)
 {
-       target_freq = clamp_val(target_freq, policy->min, policy->max);
-       policy->cached_target_freq = target_freq;
+       unsigned int idx;
 
-       if (cpufreq_driver->target_index) {
-               unsigned int idx;
-
-               idx = cpufreq_frequency_table_target(policy, target_freq,
-                                                    relation);
-               policy->cached_resolved_idx = idx;
-               return policy->freq_table[idx].frequency;
-       }
+       target_freq = clamp_val(target_freq, policy->min, policy->max);
 
-       if (cpufreq_driver->resolve_freq)
-               return cpufreq_driver->resolve_freq(policy, target_freq);
+       if (!cpufreq_driver->target_index)
+               return target_freq;
 
-       return target_freq;
+       idx = cpufreq_frequency_table_target(policy, target_freq, relation);
+       policy->cached_resolved_idx = idx;
+       policy->cached_target_freq = target_freq;
+       return policy->freq_table[idx].frequency;
 }
 
 /**

diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 2e2267a365026aab650fc803356c2cd98a463716..9fd719475fcdf06ae2ade5504f708700f38415a5 100644 (file)
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -330,15 +330,6 @@ struct cpufreq_driver {
                                       unsigned long target_perf,
                                       unsigned long capacity);
 
-       /*
-        * Caches and returns the lowest driver-supported frequency greater than
-        * or equal to the target frequency, subject to any driver limitations.
-        * Does not set the frequency. Only to be implemented for drivers with
-        * target().
-        */
-       unsigned int    (*resolve_freq)(struct cpufreq_policy *policy,
-                                       unsigned int target_freq);
-
        /*
         * Only for drivers with target_index() and CPUFREQ_ASYNC_NOTIFICATION
         * unset.