| Message ID | b5ac439050ab3c5b92621e20490fe7f46d631ef6.1624946983.git.viresh.kumar@linaro.org |
|---|---|
| State | Accepted |
| Commit | f9ccdec24d91ffddf1c6f4173b0e191fc08c7d14 |
| Headers | show |
| Series | [1/2] cpufreq: Reuse cpufreq_driver_resolve_freq() in __cpufreq_driver_target() | expand |
On Tue, Jun 29, 2021 at 8:27 AM Viresh Kumar <viresh.kumar@linaro.org> wrote: > > __cpufreq_driver_target() open codes cpufreq_driver_resolve_freq(), lets > make the former reuse the later. > > Separate out __resolve_freq() to accept relation as well as an argument > and use it at both the locations. > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > drivers/cpufreq/cpufreq.c | 42 ++++++++++++++++++++------------------- > 1 file changed, 22 insertions(+), 20 deletions(-) > > diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c > index 802abc925b2a..d691c6c97c79 100644 > --- a/drivers/cpufreq/cpufreq.c > +++ b/drivers/cpufreq/cpufreq.c > @@ -524,19 +524,8 @@ void cpufreq_disable_fast_switch(struct cpufreq_policy *policy) > } > EXPORT_SYMBOL_GPL(cpufreq_disable_fast_switch); > > -/** > - * cpufreq_driver_resolve_freq - Map a target frequency to a driver-supported > - * one. > - * @policy: associated policy to interrogate > - * @target_freq: target frequency to resolve. > - * > - * The target to driver frequency mapping is cached in the policy. > - * > - * Return: Lowest driver-supported frequency greater than or equal to the > - * given target_freq, subject to policy (min/max) and driver limitations. > - */ > -unsigned int cpufreq_driver_resolve_freq(struct cpufreq_policy *policy, > - unsigned int target_freq) > +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; > @@ -545,7 +534,7 @@ unsigned int cpufreq_driver_resolve_freq(struct cpufreq_policy *policy, > unsigned int idx; > > idx = cpufreq_frequency_table_target(policy, target_freq, > - CPUFREQ_RELATION_L); > + relation); > policy->cached_resolved_idx = idx; > return policy->freq_table[idx].frequency; > } > @@ -555,6 +544,23 @@ unsigned int cpufreq_driver_resolve_freq(struct cpufreq_policy *policy, > > return target_freq; > } > + > +/** > + * cpufreq_driver_resolve_freq - Map a target frequency to a driver-supported > + * one. > + * @policy: associated policy to interrogate > + * @target_freq: target frequency to resolve. > + * > + * The target to driver frequency mapping is cached in the policy. > + * > + * Return: Lowest driver-supported frequency greater than or equal to the > + * given target_freq, subject to policy (min/max) and driver limitations. > + */ > +unsigned int cpufreq_driver_resolve_freq(struct cpufreq_policy *policy, > + unsigned int target_freq) > +{ > + return __resolve_freq(policy, target_freq, CPUFREQ_RELATION_L); > +} > EXPORT_SYMBOL_GPL(cpufreq_driver_resolve_freq); > > unsigned int cpufreq_policy_transition_delay_us(struct cpufreq_policy *policy) > @@ -2225,13 +2231,11 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, > unsigned int relation) > { > unsigned int old_target_freq = target_freq; > - int index; > > if (cpufreq_disabled()) > return -ENODEV; > > - /* Make sure that target_freq is within supported range */ > - target_freq = clamp_val(target_freq, policy->min, policy->max); > + target_freq = __resolve_freq(policy, target_freq, relation); > > pr_debug("target for CPU %u: %u kHz, relation %u, requested %u kHz\n", > policy->cpu, target_freq, relation, old_target_freq); > @@ -2252,9 +2256,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, > if (!cpufreq_driver->target_index) > return -EINVAL; > > - index = cpufreq_frequency_table_target(policy, target_freq, relation); > - > - return __target_index(policy, index); > + return __target_index(policy, policy->cached_resolved_idx); > } > EXPORT_SYMBOL_GPL(__cpufreq_driver_target); > > -- Applied as 5.14-rc1 material along with the [2/2], thanks!
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 802abc925b2a..d691c6c97c79 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -524,19 +524,8 @@ void cpufreq_disable_fast_switch(struct cpufreq_policy *policy) } EXPORT_SYMBOL_GPL(cpufreq_disable_fast_switch); -/** - * cpufreq_driver_resolve_freq - Map a target frequency to a driver-supported - * one. - * @policy: associated policy to interrogate - * @target_freq: target frequency to resolve. - * - * The target to driver frequency mapping is cached in the policy. - * - * Return: Lowest driver-supported frequency greater than or equal to the - * given target_freq, subject to policy (min/max) and driver limitations. - */ -unsigned int cpufreq_driver_resolve_freq(struct cpufreq_policy *policy, - unsigned int target_freq) +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; @@ -545,7 +534,7 @@ unsigned int cpufreq_driver_resolve_freq(struct cpufreq_policy *policy, unsigned int idx; idx = cpufreq_frequency_table_target(policy, target_freq, - CPUFREQ_RELATION_L); + relation); policy->cached_resolved_idx = idx; return policy->freq_table[idx].frequency; } @@ -555,6 +544,23 @@ unsigned int cpufreq_driver_resolve_freq(struct cpufreq_policy *policy, return target_freq; } + +/** + * cpufreq_driver_resolve_freq - Map a target frequency to a driver-supported + * one. + * @policy: associated policy to interrogate + * @target_freq: target frequency to resolve. + * + * The target to driver frequency mapping is cached in the policy. + * + * Return: Lowest driver-supported frequency greater than or equal to the + * given target_freq, subject to policy (min/max) and driver limitations. + */ +unsigned int cpufreq_driver_resolve_freq(struct cpufreq_policy *policy, + unsigned int target_freq) +{ + return __resolve_freq(policy, target_freq, CPUFREQ_RELATION_L); +} EXPORT_SYMBOL_GPL(cpufreq_driver_resolve_freq); unsigned int cpufreq_policy_transition_delay_us(struct cpufreq_policy *policy) @@ -2225,13 +2231,11 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, unsigned int relation) { unsigned int old_target_freq = target_freq; - int index; if (cpufreq_disabled()) return -ENODEV; - /* Make sure that target_freq is within supported range */ - target_freq = clamp_val(target_freq, policy->min, policy->max); + target_freq = __resolve_freq(policy, target_freq, relation); pr_debug("target for CPU %u: %u kHz, relation %u, requested %u kHz\n", policy->cpu, target_freq, relation, old_target_freq); @@ -2252,9 +2256,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, if (!cpufreq_driver->target_index) return -EINVAL; - index = cpufreq_frequency_table_target(policy, target_freq, relation); - - return __target_index(policy, index); + return __target_index(policy, policy->cached_resolved_idx); } EXPORT_SYMBOL_GPL(__cpufreq_driver_target);
__cpufreq_driver_target() open codes cpufreq_driver_resolve_freq(), lets make the former reuse the later. Separate out __resolve_freq() to accept relation as well as an argument and use it at both the locations. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/cpufreq/cpufreq.c | 42 ++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 20 deletions(-) -- 2.31.1.272.g89b43f80a514