Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb2f50ff authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: drivers: Remove unnecessary assignments of policy-> members 



Some assignments of policy-> min/max/cur/cpuinfo.min_freq/cpuinfo.max_freq
aren't required as part of it is done by cpufreq driver or cpufreq core.

Remove them.

At some places we merge multiple lines together too.

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8a00627a

Documentation/cpu-freq/cpu-drivers.txt

+3 −2
Original line number Diff line number Diff line
@@ -108,8 +108,9 @@ policy->governor must contain the "default policy" for 
				cpufreq_driver.target is called with

				these values.



For setting some of these values, the frequency table helpers might be

helpful. See the section 2 for more information on them.

For setting some of these values (cpuinfo.min[max]_freq, policy->min[max]), the

frequency table helpers might be helpful. See the section 2 for more information

on them.



SMP systems normally have same clock source for a group of cpus. For these the

.init() would be called only once for the first online cpu. Here the .init()

arch/arm/mach-davinci/cpufreq.c

+8 −13
Original line number Diff line number Diff line
@@ -137,21 +137,16 @@ static int davinci_cpu_init(struct cpufreq_policy *policy) 
			return result;

	}



	policy->cur = policy->min = policy->max = davinci_getspeed(0);

	policy->cur = davinci_getspeed(0);



	if (freq_table) {

	result = cpufreq_frequency_table_cpuinfo(policy, freq_table);

		if (!result)

			cpufreq_frequency_table_get_attr(freq_table,

							policy->cpu);

	} else {

		policy->cpuinfo.min_freq = policy->min;

		policy->cpuinfo.max_freq = policy->max;

	if (result) {

		pr_err("%s: cpufreq_frequency_table_cpuinfo() failed",

				__func__);

		return result;

	}



	policy->min = policy->cpuinfo.min_freq;

	policy->max = policy->cpuinfo.max_freq;

	policy->cur = davinci_getspeed(0);

	cpufreq_frequency_table_get_attr(freq_table, policy->cpu);



	/*

	 * Time measurement across the target() function yields ~1500-1800us

arch/arm/mach-imx/cpufreq.c

+0 −3
Original line number Diff line number Diff line
@@ -144,14 +144,11 @@ static int mxc_cpufreq_init(struct cpufreq_policy *policy) 
	imx_freq_table[i].frequency = CPUFREQ_TABLE_END;



	policy->cur = clk_get_rate(cpu_clk) / 1000;

	policy->min = policy->cpuinfo.min_freq = cpu_freq_khz_min;

	policy->max = policy->cpuinfo.max_freq = cpu_freq_khz_max;



	/* Manual states, that PLL stabilizes in two CLK32 periods */

	policy->cpuinfo.transition_latency = 2 * NANOSECOND / CLK32_FREQ;



	ret = cpufreq_frequency_table_cpuinfo(policy, imx_freq_table);



	if (ret < 0) {

		printk(KERN_ERR "%s: failed to register i.MXC CPUfreq with error code %d\n",

		       __func__, ret);

arch/sh/kernel/cpufreq.c

+3 −6
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		return PTR_ERR(cpuclk);

	}



	policy->cur = policy->min = policy->max = sh_cpufreq_get(cpu);

	policy->cur = sh_cpufreq_get(cpu);



	freq_table = cpuclk->nr_freqs ? cpuclk->freq_table : NULL;

	if (freq_table) {
@@ -129,15 +129,12 @@ static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy) 
		dev_notice(dev, "no frequency table found, falling back "

			   "to rate rounding.\n");



		policy->cpuinfo.min_freq =

		policy->min = policy->cpuinfo.min_freq =

			(clk_round_rate(cpuclk, 1) + 500) / 1000;

		policy->cpuinfo.max_freq =

		policy->max = policy->cpuinfo.max_freq =

			(clk_round_rate(cpuclk, ~0UL) + 500) / 1000;

	}



	policy->min = policy->cpuinfo.min_freq;

	policy->max = policy->cpuinfo.max_freq;



	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;



	dev_info(dev, "CPU Frequencies - Minimum %u.%03u MHz, "

drivers/cpufreq/cpufreq-nforce2.c

+2 −4
Original line number Diff line number Diff line
@@ -359,12 +359,10 @@ static int nforce2_cpu_init(struct cpufreq_policy *policy) 
		min_fsb = NFORCE2_MIN_FSB;



	/* cpuinfo and default policy values */

	policy->cpuinfo.min_freq = min_fsb * fid * 100;

	policy->cpuinfo.max_freq = max_fsb * fid * 100;

	policy->min = policy->cpuinfo.min_freq = min_fsb * fid * 100;

	policy->max = policy->cpuinfo.max_freq = max_fsb * fid * 100;

	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;

	policy->cur = nforce2_get(policy->cpu);

	policy->min = policy->cpuinfo.min_freq;

	policy->max = policy->cpuinfo.max_freq;



	return 0;

}