Commit b3beca76 authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: Remove ->resolve_freq() 



Commit e3c06236 ("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: default avatarViresh Kumar <viresh.kumar@linaro.org>
[ rjw: Changelog edits ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f9ccdec2

Documentation/cpu-freq/cpu-drivers.rst

+0 −3
Original line number Diff line number Diff line
@@ -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.

Documentation/translations/zh_CN/cpu-freq/cpu-drivers.rst

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ CPUfreq核心层注册一个cpufreq_driver结构体。 


 .driver_data - cpufreq驱动程序的特定数据。



 .resolve_freq - 返回最适合目标频率的频率。不过并不能改变频率。



 .get_intermediate 和 target_intermediate - 用于在改变CPU频率时切换到稳定

 的频率。

drivers/cpufreq/cpufreq.c

+8 −13
Original line number Diff line number Diff line
@@ -527,24 +527,19 @@ EXPORT_SYMBOL_GPL(cpufreq_disable_fast_switch); 
static unsigned int __resolve_freq(struct cpufreq_policy *policy,

		unsigned int target_freq, unsigned int relation)

{

	unsigned int idx;



	target_freq = clamp_val(target_freq, policy->min, policy->max);

	policy->cached_target_freq = target_freq;



	if (cpufreq_driver->target_index) {

		unsigned int idx;

	if (!cpufreq_driver->target_index)

		return target_freq;



		idx = cpufreq_frequency_table_target(policy, target_freq,

						     relation);

	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;

}



	if (cpufreq_driver->resolve_freq)

		return cpufreq_driver->resolve_freq(policy, target_freq);



	return target_freq;

}



/**

 * cpufreq_driver_resolve_freq - Map a target frequency to a driver-supported

 * one.

include/linux/cpufreq.h

+0 −9
Original line number Diff line number Diff line
@@ -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.