<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26440">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cpu/intel: Use different name for variables and structs<br><br>My previous changes 'Get ride of device_t' introduced a<br>confusion by using the same name for variables and structs.<br><br>Change-Id: I441830bd82f068c13a72d51509766b70d14108c2<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/cpu/intel/fsp_model_206ax/acpi.c<br>M src/cpu/intel/fsp_model_406dx/acpi.c<br>M src/cpu/intel/haswell/acpi.c<br>M src/cpu/intel/model_2065x/acpi.c<br>M src/cpu/intel/model_206ax/acpi.c<br>M src/cpu/intel/speedstep/acpi.c<br>6 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/26440/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/cpu/intel/fsp_model_206ax/acpi.c b/src/cpu/intel/fsp_model_206ax/acpi.c</span><br><span>index a10c91b..8bfb6d0 100644</span><br><span>--- a/src/cpu/intel/fsp_model_206ax/acpi.c</span><br><span>+++ b/src/cpu/intel/fsp_model_206ax/acpi.c</span><br><span>@@ -298,7 +298,7 @@</span><br><span> acpigen_pop_len();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void generate_cpu_entries(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+void generate_cpu_entries(struct device *dev)</span><br><span> {</span><br><span> int coreID, cpuID, pcontrol_blk = PMB0_BASE, plen = 6;</span><br><span> int totalcores = dev_count_cpu();</span><br><span>diff --git a/src/cpu/intel/fsp_model_406dx/acpi.c b/src/cpu/intel/fsp_model_406dx/acpi.c</span><br><span>index 80a56c0..4b96b3f 100644</span><br><span>--- a/src/cpu/intel/fsp_model_406dx/acpi.c</span><br><span>+++ b/src/cpu/intel/fsp_model_406dx/acpi.c</span><br><span>@@ -259,7 +259,7 @@</span><br><span> acpigen_pop_len();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void generate_cpu_entries(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+void generate_cpu_entries(struct device *dev)</span><br><span> {</span><br><span> int coreID, cpuID, pcontrol_blk = PMB0_BASE, plen = 6;</span><br><span> int totalcores = dev_count_cpu();</span><br><span>diff --git a/src/cpu/intel/haswell/acpi.c b/src/cpu/intel/haswell/acpi.c</span><br><span>index 40279bf..24a9a15 100644</span><br><span>--- a/src/cpu/intel/haswell/acpi.c</span><br><span>+++ b/src/cpu/intel/haswell/acpi.c</span><br><span>@@ -303,7 +303,7 @@</span><br><span> acpigen_pop_len();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void generate_cpu_entries(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+void generate_cpu_entries(struct device *dev)</span><br><span> {</span><br><span> int coreID, cpuID, pcontrol_blk = get_pmbase(), plen = 6;</span><br><span> int totalcores = dev_count_cpu();</span><br><span>diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c</span><br><span>index 7de8b19..eec150f 100644</span><br><span>--- a/src/cpu/intel/model_2065x/acpi.c</span><br><span>+++ b/src/cpu/intel/model_2065x/acpi.c</span><br><span>@@ -295,7 +295,7 @@</span><br><span> acpigen_pop_len();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void generate_cpu_entries(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+void generate_cpu_entries(struct device *dev)</span><br><span> {</span><br><span> int coreID, cpuID, pcontrol_blk = PMB0_BASE, plen = 6;</span><br><span> int totalcores = dev_count_cpu();</span><br><span>diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c</span><br><span>index 8e2c0d1..02ea69c 100644</span><br><span>--- a/src/cpu/intel/model_206ax/acpi.c</span><br><span>+++ b/src/cpu/intel/model_206ax/acpi.c</span><br><span>@@ -298,7 +298,7 @@</span><br><span> acpigen_pop_len();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void generate_cpu_entries(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+void generate_cpu_entries(struct device *dev)</span><br><span> {</span><br><span> int coreID, cpuID, pcontrol_blk = PMB0_BASE, plen = 6;</span><br><span> int totalcores = dev_count_cpu();</span><br><span>diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c</span><br><span>index 0feaa2f..ac994da 100644</span><br><span>--- a/src/cpu/intel/speedstep/acpi.c</span><br><span>+++ b/src/cpu/intel/speedstep/acpi.c</span><br><span>@@ -113,7 +113,7 @@</span><br><span> /**</span><br><span> * @brief Generate ACPI entries for Speedstep for each cpu</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-void generate_cpu_entries(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+void generate_cpu_entries(struct device *dev)</span><br><span> {</span><br><span> int coreID, cpuID, pcontrol_blk = PMB0_BASE, plen = 6;</span><br><span> int totalcores = determine_total_number_of_cores();</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26440">change 26440</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26440"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I441830bd82f068c13a72d51509766b70d14108c2 </div>
<div style="display:none"> Gerrit-Change-Number: 26440 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>