Commit 3cbbe887 authored by Gautham R. Shenoy's avatar Gautham R. Shenoy Committed by Rafael J. Wysocki
Browse files

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: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarLi Meng <li.meng@amd.com>
Tested-by: default avatarDhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
Signed-off-by: default avatarGautham R. Shenoy <gautham.shenoy@amd.com>
Signed-off-by: default avatarPerry Yuan <perry.yuan@amd.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5547c0eb

drivers/cpufreq/amd-pstate.c

+10 −30
Original line number Diff line number Diff line
@@ -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);