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

Commit 041526f9 authored by Stratos Karafotis's avatar Stratos Karafotis Committed by Rafael J. Wysocki
Browse files

cpufreq: Use cpufreq_for_each_* macros for frequency table iteration 



The cpufreq core now supports the cpufreq_for_each_entry and
cpufreq_for_each_valid_entry macros helpers for iteration over the
cpufreq_frequency_table, so use them.

It should have no functional changes.

Signed-off-by: default avatarStratos Karafotis <stratosk@semaphore.gr>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 27e289dc

drivers/cpufreq/acpi-cpufreq.c

+4 −5
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static unsigned extract_io(u32 value, struct acpi_cpufreq_data *data) 


static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)

{

	int i;

	struct cpufreq_frequency_table *pos;

	struct acpi_processor_performance *perf;



	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
@@ -223,10 +223,9 @@ static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data) 


	perf = data->acpi_data;



	for (i = 0; data->freq_table[i].frequency != CPUFREQ_TABLE_END; i++) {

		if (msr == perf->states[data->freq_table[i].driver_data].status)

			return data->freq_table[i].frequency;

	}

	cpufreq_for_each_entry(pos, data->freq_table)

		if (msr == perf->states[pos->driver_data].status)

			return pos->frequency;

	return data->freq_table[0].frequency;

}

drivers/cpufreq/arm_big_little.c

+8 −8
Original line number Diff line number Diff line
@@ -226,22 +226,22 @@ static inline u32 get_table_count(struct cpufreq_frequency_table *table) 
/* get the minimum frequency in the cpufreq_frequency_table */

static inline u32 get_table_min(struct cpufreq_frequency_table *table)

{

	int i;

	struct cpufreq_frequency_table *pos;

	uint32_t min_freq = ~0;

	for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++)

		if (table[i].frequency < min_freq)

			min_freq = table[i].frequency;

	cpufreq_for_each_entry(pos, table)

		if (pos->frequency < min_freq)

			min_freq = pos->frequency;

	return min_freq;

}



/* get the maximum frequency in the cpufreq_frequency_table */

static inline u32 get_table_max(struct cpufreq_frequency_table *table)

{

	int i;

	struct cpufreq_frequency_table *pos;

	uint32_t max_freq = 0;

	for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++)

		if (table[i].frequency > max_freq)

			max_freq = table[i].frequency;

	cpufreq_for_each_entry(pos, table)

		if (pos->frequency > max_freq)

			max_freq = pos->frequency;

	return max_freq;

}

drivers/cpufreq/cpufreq_stats.c

+8 −16
Original line number Diff line number Diff line
@@ -182,11 +182,11 @@ static void cpufreq_stats_free_table(unsigned int cpu) 


static int __cpufreq_stats_create_table(struct cpufreq_policy *policy)

{

	unsigned int i, j, count = 0, ret = 0;

	unsigned int i, count = 0, ret = 0;

	struct cpufreq_stats *stat;

	unsigned int alloc_size;

	unsigned int cpu = policy->cpu;

	struct cpufreq_frequency_table *table;

	struct cpufreq_frequency_table *pos, *table;



	table = cpufreq_frequency_get_table(cpu);

	if (unlikely(!table))
@@ -205,12 +205,8 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy) 
	stat->cpu = cpu;

	per_cpu(cpufreq_stats_table, cpu) = stat;



	for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {

		unsigned int freq = table[i].frequency;

		if (freq == CPUFREQ_ENTRY_INVALID)

			continue;

	cpufreq_for_each_valid_entry(pos, table)

		count++;

	}



	alloc_size = count * sizeof(int) + count * sizeof(u64);
@@ -228,15 +224,11 @@ static int __cpufreq_stats_create_table(struct cpufreq_policy *policy) 
#ifdef CONFIG_CPU_FREQ_STAT_DETAILS

	stat->trans_table = stat->freq_table + count;

#endif

	j = 0;

	for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {

		unsigned int freq = table[i].frequency;

		if (freq == CPUFREQ_ENTRY_INVALID)

			continue;

		if (freq_table_get_index(stat, freq) == -1)

			stat->freq_table[j++] = freq;

	}

	stat->state_num = j;

	i = 0;

	cpufreq_for_each_valid_entry(pos, table)

		if (freq_table_get_index(stat, pos->frequency) == -1)

			stat->freq_table[i++] = pos->frequency;

	stat->state_num = i;

	spin_lock(&cpufreq_stats_lock);

	stat->last_time = get_jiffies_64();

	stat->last_index = freq_table_get_index(stat, policy->cur);

drivers/cpufreq/dbx500-cpufreq.c

+3 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static struct cpufreq_driver dbx500_cpufreq_driver = { 


static int dbx500_cpufreq_probe(struct platform_device *pdev)

{

	int i = 0;

	struct cpufreq_frequency_table *pos;



	freq_table = dev_get_platdata(&pdev->dev);

	if (!freq_table) {
@@ -60,10 +60,8 @@ static int dbx500_cpufreq_probe(struct platform_device *pdev) 
	}



	pr_info("dbx500-cpufreq: Available frequencies:\n");

	while (freq_table[i].frequency != CPUFREQ_TABLE_END) {

		pr_info("  %d Mhz\n", freq_table[i].frequency/1000);

		i++;

	}

	cpufreq_for_each_entry(pos, freq_table)

		pr_info("  %d Mhz\n", pos->frequency / 1000);



	return cpufreq_register_driver(&dbx500_cpufreq_driver);

}

drivers/cpufreq/elanfreq.c

+4 −5
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static int elanfreq_target(struct cpufreq_policy *policy, 
static int elanfreq_cpu_init(struct cpufreq_policy *policy)

{

	struct cpuinfo_x86 *c = &cpu_data(0);

	unsigned int i;

	struct cpufreq_frequency_table *pos;



	/* capability check */

	if ((c->x86_vendor != X86_VENDOR_AMD) ||
@@ -159,10 +159,9 @@ static int elanfreq_cpu_init(struct cpufreq_policy *policy) 
		max_freq = elanfreq_get_cpu_frequency(0);



	/* table init */

	for (i = 0; (elanfreq_table[i].frequency != CPUFREQ_TABLE_END); i++) {

		if (elanfreq_table[i].frequency > max_freq)

			elanfreq_table[i].frequency = CPUFREQ_ENTRY_INVALID;

	}

	cpufreq_for_each_entry(pos, elanfreq_table)

		if (pos->frequency > max_freq)

			pos->frequency = CPUFREQ_ENTRY_INVALID;



	/* cpuinfo and default policy values */

	policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;