RE: [PATCH v9 4/8] cpufreq: amd-pstate: Remove amd_get_{min,max,nominal,lowest_nonlinear}_freq()

[Meng, Li (Jassmine)]

[AMD Official Use Only - General]

> -----Original Message-----
> From: Yuan, Perry <Perry.Yuan@xxxxxxx>
> Sent: Tuesday, March 19, 2024 4:29 PM
> To: rafael.j.wysocki@xxxxxxxxx; Limonciello, Mario
> <Mario.Limonciello@xxxxxxx>; viresh.kumar@xxxxxxxxxx; Shenoy, Gautham
> Ranjal <gautham.shenoy@xxxxxxx>; Petkov, Borislav
> <Borislav.Petkov@xxxxxxx>; Huang, Ray <Ray.Huang@xxxxxxx>
> Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Huang, Shimmer
> <Shimmer.Huang@xxxxxxx>; oleksandr@xxxxxxxxxxxxxx; Du, Xiaojian
> <Xiaojian.Du@xxxxxxx>; Meng, Li (Jassmine) <Li.Meng@xxxxxxx>; linux-
> pm@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> Subject: [PATCH v9 4/8] cpufreq: amd-pstate: Remove
> amd_get_{min,max,nominal,lowest_nonlinear}_freq()
>
> From: "Gautham R. Shenoy" <gautham.shenoy@xxxxxxx>
>
> amd_get_{min,max,nominal,lowest_nonlinear}_freq() functions merely
> return cpudata->{min,max,nominal,lowest_nonlinear}_freq values.
>
> There is no loss in readability in replacing their invocations by accesses to the
> corresponding members of cpudata.
>
> Do so and remove these helper functions.
>
> Signed-off-by: Gautham R. Shenoy <gautham.shenoy@xxxxxxx>
> Signed-off-by: Perry Yuan <perry.yuan@xxxxxxx>
> ---
>  drivers/cpufreq/amd-pstate.c | 40 +++++++++---------------------------
>  1 file changed, 10 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index ba1baa6733e6..132330b4942f 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -604,26 +604,6 @@ static void amd_pstate_adjust_perf(unsigned int
> cpu,
>       cpufreq_cpu_put(policy);
>  }
>
> -static int amd_get_min_freq(struct amd_cpudata *cpudata) -{
> -     return READ_ONCE(cpudata->min_freq);
> -}
> -
> -static int amd_get_max_freq(struct amd_cpudata *cpudata) -{
> -     return READ_ONCE(cpudata->max_freq);
> -}
> -
> -static int amd_get_nominal_freq(struct amd_cpudata *cpudata) -{
> -     return READ_ONCE(cpudata->nominal_freq);
> -}
> -
> -static int amd_get_lowest_nonlinear_freq(struct amd_cpudata *cpudata) -{
> -     return READ_ONCE(cpudata->lowest_nonlinear_freq);
> -}
> -
>  static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)  {
>       struct amd_cpudata *cpudata = policy->driver_data; @@ -854,10
> +834,10 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
>       if (ret)
>               goto free_cpudata1;
>
> -     min_freq = amd_get_min_freq(cpudata);
> -     max_freq = amd_get_max_freq(cpudata);
> -     nominal_freq = amd_get_nominal_freq(cpudata);
> -     lowest_nonlinear_freq = amd_get_lowest_nonlinear_freq(cpudata);
> +     min_freq = READ_ONCE(cpudata->min_freq);
> +     max_freq = READ_ONCE(cpudata->max_freq);
> +     nominal_freq = READ_ONCE(cpudata->nominal_freq);
> +     lowest_nonlinear_freq = READ_ONCE(cpudata-
> >lowest_nonlinear_freq);
>
>       if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
>               dev_err(dev, "min_freq(%d) or max_freq(%d) value is
> incorrect\n", @@ -960,7 +940,7 @@ static ssize_t
> show_amd_pstate_max_freq(struct cpufreq_policy *policy,
>       int max_freq;
>       struct amd_cpudata *cpudata = policy->driver_data;
>
> -     max_freq = amd_get_max_freq(cpudata);
> +     max_freq = READ_ONCE(cpudata->max_freq);
>       if (max_freq < 0)
>               return max_freq;
>
> @@ -973,7 +953,7 @@ static ssize_t
> show_amd_pstate_lowest_nonlinear_freq(struct cpufreq_policy *poli
>       int freq;
>       struct amd_cpudata *cpudata = policy->driver_data;
>
> -     freq = amd_get_lowest_nonlinear_freq(cpudata);
> +     freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
>       if (freq < 0)
>               return freq;
>
> @@ -1315,10 +1295,10 @@ static int amd_pstate_epp_cpu_init(struct
> cpufreq_policy *policy)
>       if (ret)
>               goto free_cpudata1;
>
> -     min_freq = amd_get_min_freq(cpudata);
> -     max_freq = amd_get_max_freq(cpudata);
> -     nominal_freq = amd_get_nominal_freq(cpudata);
> -     lowest_nonlinear_freq = amd_get_lowest_nonlinear_freq(cpudata);
> +     min_freq = READ_ONCE(cpudata->min_freq);
> +     max_freq = READ_ONCE(cpudata->max_freq);
> +     nominal_freq = READ_ONCE(cpudata->nominal_freq);
> +     lowest_nonlinear_freq = READ_ONCE(cpudata-
> >lowest_nonlinear_freq);
>       if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
>               dev_err(dev, "min_freq(%d) or max_freq(%d) value is
> incorrect\n",
>                               min_freq, max_freq);
> --
> 2.34.1
[Meng, Li (Jassmine)]
Reviewed-by: Li Meng < li.meng@xxxxxxx>