Skip to contentSkip to conversation

cpufreq: acpi-cpufreq: Use cpufreq_for_each_entry macro for iteration

PATCH Superseded Stratos Karafotis 2 participants 3 messages Apr 14, 2014 – Apr 15, 2014 CPU frequency scaling framework

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH 2/20 cpufreq: acpi-cpufreq: Use cpufreq_for_each_entry macro for iteration

The cpufreq core supports the cpufreq_for_each_entry macro helper for iteration over the cpufreq_frequency_table, so use it.

It should have no functional changes.

---
 drivers/cpufreq/acpi-cpufreq.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/cpufreq/acpi-cpufreq.c +5 -5
index 000e4e0..12a5750 100644
@@ -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,11 +223,11 @@ 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;
+	return data->freq_table->frequency;
 }
 
 static unsigned extract_freq(u32 val, struct acpi_cpufreq_data *data)
Signature · 1 line
1.9.0
maintainer
#1 lore raw
Quoted 26 lines · Stratos Karafotis

The cpufreq core supports the cpufreq_for_each_entry macro helper for iteration over the cpufreq_frequency_table, so use it.

It should have no functional changes.

---
 drivers/cpufreq/acpi-cpufreq.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/cpufreq/acpi-cpufreq.c +1 -1
index 000e4e0..12a5750 100644
@@ -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,11 +223,11 @@ static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
 
        perf = data->acpi_data;

drivers/cpufreq/acpi-cpufreq.c static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data) · line 230

Quoted 10 lines
drivers/cpufreq/acpi-cpufreq.c +4 -4
 
-       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;
+       return data->freq_table->frequency;

This isn't a related change, isn't it? Also it make it less readable. So probably
just leave it as is.

#2 lore raw
Quoted 28 lines · Viresh Kumar
Quoted 27 lines · Stratos Karafotis

The cpufreq core supports the cpufreq_for_each_entry macro helper for iteration over the cpufreq_frequency_table, so use it.

It should have no functional changes.

---
 drivers/cpufreq/acpi-cpufreq.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/cpufreq/acpi-cpufreq.c +1 -1
index 000e4e0..12a5750 100644
@@ -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,11 +223,11 @@ static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data)
 
        perf = data->acpi_data;
 
Quoted 14 lines

drivers/cpufreq/acpi-cpufreq.c static unsigned extract_msr(u32 msr, struct acpi_cpufreq_data *data) · line 230

Quoted 9 lines
drivers/cpufreq/acpi-cpufreq.c +4 -4
-       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;
+       return data->freq_table->frequency;

This isn't a related change, isn't it? Also it make it less readable. So probably
just leave it as is.

I thought that since we use pointer notation it would be more clear. But, I will change it according to your suggestion.

Stratos