Skip to content

Commit 3cbbe88

Browse files
gautshenrafaeljw
authored andcommitted
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 <[email protected]> Reviewed-by: Li Meng <[email protected]> Tested-by: Dhananjay Ugwekar <[email protected]> Signed-off-by: Gautham R. Shenoy <[email protected]> Signed-off-by: Perry Yuan <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 5547c0e commit 3cbbe88

File tree

1 file changed

+10
-30
lines changed

1 file changed

+10
-30
lines changed

drivers/cpufreq/amd-pstate.c

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -604,26 +604,6 @@ static void amd_pstate_adjust_perf(unsigned int cpu,
604604
cpufreq_cpu_put(policy);
605605
}
606606

607-
static int amd_get_min_freq(struct amd_cpudata *cpudata)
608-
{
609-
return READ_ONCE(cpudata->min_freq);
610-
}
611-
612-
static int amd_get_max_freq(struct amd_cpudata *cpudata)
613-
{
614-
return READ_ONCE(cpudata->max_freq);
615-
}
616-
617-
static int amd_get_nominal_freq(struct amd_cpudata *cpudata)
618-
{
619-
return READ_ONCE(cpudata->nominal_freq);
620-
}
621-
622-
static int amd_get_lowest_nonlinear_freq(struct amd_cpudata *cpudata)
623-
{
624-
return READ_ONCE(cpudata->lowest_nonlinear_freq);
625-
}
626-
627607
static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)
628608
{
629609
struct amd_cpudata *cpudata = policy->driver_data;
@@ -854,10 +834,10 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
854834
if (ret)
855835
goto free_cpudata1;
856836

857-
min_freq = amd_get_min_freq(cpudata);
858-
max_freq = amd_get_max_freq(cpudata);
859-
nominal_freq = amd_get_nominal_freq(cpudata);
860-
lowest_nonlinear_freq = amd_get_lowest_nonlinear_freq(cpudata);
837+
min_freq = READ_ONCE(cpudata->min_freq);
838+
max_freq = READ_ONCE(cpudata->max_freq);
839+
nominal_freq = READ_ONCE(cpudata->nominal_freq);
840+
lowest_nonlinear_freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
861841

862842
if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
863843
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,
960940
int max_freq;
961941
struct amd_cpudata *cpudata = policy->driver_data;
962942

963-
max_freq = amd_get_max_freq(cpudata);
943+
max_freq = READ_ONCE(cpudata->max_freq);
964944
if (max_freq < 0)
965945
return max_freq;
966946

@@ -973,7 +953,7 @@ static ssize_t show_amd_pstate_lowest_nonlinear_freq(struct cpufreq_policy *poli
973953
int freq;
974954
struct amd_cpudata *cpudata = policy->driver_data;
975955

976-
freq = amd_get_lowest_nonlinear_freq(cpudata);
956+
freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
977957
if (freq < 0)
978958
return freq;
979959

@@ -1315,10 +1295,10 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
13151295
if (ret)
13161296
goto free_cpudata1;
13171297

1318-
min_freq = amd_get_min_freq(cpudata);
1319-
max_freq = amd_get_max_freq(cpudata);
1320-
nominal_freq = amd_get_nominal_freq(cpudata);
1321-
lowest_nonlinear_freq = amd_get_lowest_nonlinear_freq(cpudata);
1298+
min_freq = READ_ONCE(cpudata->min_freq);
1299+
max_freq = READ_ONCE(cpudata->max_freq);
1300+
nominal_freq = READ_ONCE(cpudata->nominal_freq);
1301+
lowest_nonlinear_freq = READ_ONCE(cpudata->lowest_nonlinear_freq);
13221302
if (min_freq < 0 || max_freq < 0 || min_freq > max_freq) {
13231303
dev_err(dev, "min_freq(%d) or max_freq(%d) value is incorrect\n",
13241304
min_freq, max_freq);

0 commit comments

Comments
 (0)