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

Commit 38c52e63 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Ingo Molnar
Browse files

powernow-k8: Replace cpu_core_mask() with topology_core_cpumask() 



The former duplicates the functionality of the latter but is
neither documented nor arch-independent.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarRafael J. Wysocki <rjw@rjwysocki.net>
Cc: Benoit Cousson <bcousson@baylibre.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Jean Delvare <jdelvare@suse.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1432645896-12588-5-git-send-email-bgolaszewski@baylibre.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 19a34eea

drivers/cpufreq/powernow-k8.c

+3 −10
Original line number Diff line number Diff line
@@ -57,13 +57,6 @@ static DEFINE_PER_CPU(struct powernow_k8_data *, powernow_data); 


static struct cpufreq_driver cpufreq_amd64_driver;



#ifndef CONFIG_SMP

static inline const struct cpumask *cpu_core_mask(int cpu)

{

	return cpumask_of(0);

}

#endif



/* Return a frequency in MHz, given an input fid */

static u32 find_freq_from_fid(u32 fid)

{
@@ -620,7 +613,7 @@ static int fill_powernow_table(struct powernow_k8_data *data, 


	pr_debug("cfid 0x%x, cvid 0x%x\n", data->currfid, data->currvid);

	data->powernow_table = powernow_table;

	if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)

	if (cpumask_first(topology_core_cpumask(data->cpu)) == data->cpu)

		print_basics(data);



	for (j = 0; j < data->numps; j++)
@@ -784,7 +777,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) 
		CPUFREQ_TABLE_END;

	data->powernow_table = powernow_table;



	if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)

	if (cpumask_first(topology_core_cpumask(data->cpu)) == data->cpu)

		print_basics(data);



	/* notify BIOS that we exist */
@@ -1090,7 +1083,7 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol) 
	if (rc != 0)

		goto err_out_exit_acpi;



	cpumask_copy(pol->cpus, cpu_core_mask(pol->cpu));

	cpumask_copy(pol->cpus, topology_core_cpumask(pol->cpu));

	data->available_cores = pol->cpus;



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