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

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

cpufreq: powernow: use cpufreq_table_validate_and_show() 



Lets use cpufreq_table_validate_and_show() instead of calling
cpufreq_frequency_table_cpuinfo() and cpufreq_frequency_table_get_attr().

Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0e645df9

drivers/cpufreq/powernow-k6.c

+1 −8
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ static int powernow_k6_target(struct cpufreq_policy *policy, 
static int powernow_k6_cpu_init(struct cpufreq_policy *policy)

{

	unsigned int i, f;

	int result;



	if (policy->cpu != 0)

		return -ENODEV;
@@ -167,13 +166,7 @@ static int powernow_k6_cpu_init(struct cpufreq_policy *policy) 
	policy->cpuinfo.transition_latency = 200000;

	policy->cur = busfreq * max_multiplier;



	result = cpufreq_frequency_table_cpuinfo(policy, clock_ratio);

	if (result)

		return result;



	cpufreq_frequency_table_get_attr(clock_ratio, policy->cpu);



	return 0;

	return cpufreq_table_validate_and_show(policy, clock_ratio);

}

drivers/cpufreq/powernow-k7.c

+1 −3
Original line number Diff line number Diff line
@@ -680,9 +680,7 @@ static int powernow_cpu_init(struct cpufreq_policy *policy) 


	policy->cur = powernow_get(0);



	cpufreq_frequency_table_get_attr(powernow_table, policy->cpu);



	return cpufreq_frequency_table_cpuinfo(policy, powernow_table);

	return cpufreq_table_validate_and_show(policy, powernow_table);

}



static int powernow_cpu_exit(struct cpufreq_policy *policy)

drivers/cpufreq/powernow-k8.c

+1 −3
Original line number Diff line number Diff line
@@ -1156,7 +1156,7 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol) 
	pr_debug("policy current frequency %d kHz\n", pol->cur);



	/* min/max the cpu is capable of */

	if (cpufreq_frequency_table_cpuinfo(pol, data->powernow_table)) {

	if (cpufreq_table_validate_and_show(pol, data->powernow_table)) {

		printk(KERN_ERR FW_BUG PFX "invalid powernow_table\n");

		powernow_k8_cpu_exit_acpi(data);

		kfree(data->powernow_table);
@@ -1164,8 +1164,6 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol) 
		return -EINVAL;

	}



	cpufreq_frequency_table_get_attr(data->powernow_table, pol->cpu);



	pr_debug("cpu_init done, current fid 0x%x, vid 0x%x\n",

		 data->currfid, data->currvid);