cpufreq: amd-pstate: Remove amd_get_{min,max,nominal,lowest_nonlinear}_freq()

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.

Acked-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Li Meng <li.meng@amd.com>
Tested-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
Signed-off-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
Signed-off-by: Perry Yuan <perry.yuan@amd.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 891fad6f90e146f9d668374c59278510b57f806b..3836d62b54ef3612c4bd0ed1dbdaada529756bd6 100644 (file)
--- 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);