<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26439">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">arch/x86: 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: I741f78e2109b03b0611b3ebd2240d65f80974d0a<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/arch/x86/acpi.c<br>M src/arch/x86/include/arch/acpi.h<br>2 files changed, 7 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/26439/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c</span><br><span>index 8b6b2c1..b7e4ed2 100644</span><br><span>--- a/src/arch/x86/acpi.c</span><br><span>+++ b/src/arch/x86/acpi.c</span><br><span>@@ -589,9 +589,9 @@</span><br><span>    header->checksum = acpi_checksum((void *)hpet, sizeof(acpi_hpet_t));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void acpi_create_vfct(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+void acpi_create_vfct(struct device *dev,</span><br><span>                    struct acpi_vfct *vfct,</span><br><span style="color: hsl(0, 100%, 40%);">-                 unsigned long (*acpi_fill_vfct)(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+                unsigned long (*acpi_fill_vfct)(struct device *dev,</span><br><span>                  struct acpi_vfct *vfct_struct, unsigned long current))</span><br><span> {</span><br><span>    acpi_header_t *header = &(vfct->header);</span><br><span>@@ -640,7 +640,7 @@</span><br><span>        header->checksum = acpi_checksum((void *)ivrs, header->length);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_write_hpet(struct device *device, unsigned long current,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_write_hpet(struct device *dev, unsigned long current,</span><br><span>  acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span>      acpi_hpet_t *hpet;</span><br><span>diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h</span><br><span>index 5480834..6450652 100644</span><br><span>--- a/src/arch/x86/include/arch/acpi.h</span><br><span>+++ b/src/arch/x86/include/arch/acpi.h</span><br><span>@@ -705,9 +705,8 @@</span><br><span> void acpi_create_slit(acpi_slit_t *slit,</span><br><span>                  unsigned long (*acpi_fill_slit)(unsigned long current));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void acpi_create_vfct(struct device *device,</span><br><span style="color: hsl(0, 100%, 40%);">-                struct acpi_vfct *vfct,</span><br><span style="color: hsl(0, 100%, 40%);">-                 unsigned long (*acpi_fill_vfct)(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+void acpi_create_vfct(struct device *dev, struct acpi_vfct *vfct,</span><br><span style="color: hsl(120, 100%, 40%);">+                     unsigned long (*acpi_fill_vfct)(struct device *dev,</span><br><span>                            struct acpi_vfct *vfct_struct,</span><br><span>                               unsigned long current));</span><br><span> </span><br><span>@@ -717,11 +716,11 @@</span><br><span> </span><br><span> #if ENV_RAMSTAGE && !defined(__SIMPLE_DEVICE__)</span><br><span> void acpi_create_hpet(acpi_hpet_t *hpet);</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long acpi_write_hpet(struct device *device, unsigned long start,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long acpi_write_hpet(struct device *dev, unsigned long start,</span><br><span>                          acpi_rsdp_t *rsdp);</span><br><span> </span><br><span> /* cpu/intel/speedstep/acpi.c */</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> #endif</span><br><span> </span><br><span> void acpi_create_mcfg(acpi_mcfg_t *mcfg);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26439">change 26439</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/26439"/><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: I741f78e2109b03b0611b3ebd2240d65f80974d0a </div>
<div style="display:none"> Gerrit-Change-Number: 26439 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>