<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26443">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/mainboard: 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: I11ca08a4e4947633c03f5382467dec54fd632780<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/mainboard/amd/serengeti_cheetah/mainboard.h<br>M src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c<br>M src/mainboard/amd/serengeti_cheetah_fam10/mainboard.h<br>M src/mainboard/getac/p470/acpi_tables.c<br>M src/mainboard/getac/p470/mainboard.h<br>M src/mainboard/google/chell/mainboard.c<br>M src/mainboard/google/eve/mainboard.c<br>M src/mainboard/google/fizz/mainboard.c<br>M src/mainboard/google/glados/mainboard.c<br>M src/mainboard/google/lars/mainboard.c<br>M src/mainboard/google/octopus/mainboard.c<br>M src/mainboard/google/poppy/mainboard.c<br>M src/mainboard/google/reef/mainboard.c<br>M src/mainboard/google/zoombini/mainboard.c<br>M src/mainboard/intel/kunimitsu/mainboard.c<br>M src/mainboard/iwill/dk8_htx/acpi_tables.c<br>M src/mainboard/iwill/dk8_htx/mainboard.h<br>M src/mainboard/lenovo/x200/mainboard.c<br>M src/mainboard/lenovo/x201/mainboard.c<br>M src/mainboard/lenovo/x60/mainboard.c<br>M src/mainboard/siemens/sitemp_g1p1/acpi_tables.c<br>21 files changed, 21 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/43/26443/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/amd/serengeti_cheetah/mainboard.h b/src/mainboard/amd/serengeti_cheetah/mainboard.h</span><br><span>index 2613374..dbc9806 100644</span><br><span>--- a/src/mainboard/amd/serengeti_cheetah/mainboard.h</span><br><span>+++ b/src/mainboard/amd/serengeti_cheetah/mainboard.h</span><br><span>@@ -11,4 +11,4 @@</span><br><span> * GNU General Public License for more details.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long mainboard_write_acpi_tables(struct device *device, unsigned long start, acpi_rsdp_t *rsdp);</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long mainboard_write_acpi_tables(struct device *dev, unsigned long start, acpi_rsdp_t *rsdp);</span><br><span>diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c</span><br><span>index e355aae..edb27fb 100644</span><br><span>--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c</span><br><span>+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c</span><br><span>@@ -119,7 +119,7 @@</span><br><span> return current;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long mainboard_write_acpi_tables(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long mainboard_write_acpi_tables(struct device *dev,</span><br><span> unsigned long current,</span><br><span> acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span>diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.h b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.h</span><br><span>index 2613374..dbc9806 100644</span><br><span>--- a/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.h</span><br><span>+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mainboard.h</span><br><span>@@ -11,4 +11,4 @@</span><br><span> * GNU General Public License for more details.</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long mainboard_write_acpi_tables(struct device *device, unsigned long start, acpi_rsdp_t *rsdp);</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long mainboard_write_acpi_tables(struct device *dev, unsigned long start, acpi_rsdp_t *rsdp);</span><br><span>diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c</span><br><span>index f840605..3dacadc 100644</span><br><span>--- a/src/mainboard/getac/p470/acpi_tables.c</span><br><span>+++ b/src/mainboard/getac/p470/acpi_tables.c</span><br><span>@@ -81,7 +81,7 @@</span><br><span> return header->length;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long mainboard_write_acpi_tables(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long mainboard_write_acpi_tables(struct device *dev,</span><br><span> unsigned long start,</span><br><span> acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span>diff --git a/src/mainboard/getac/p470/mainboard.h b/src/mainboard/getac/p470/mainboard.h</span><br><span>index 3d155c8..0fd7fde 100644</span><br><span>--- a/src/mainboard/getac/p470/mainboard.h</span><br><span>+++ b/src/mainboard/getac/p470/mainboard.h</span><br><span>@@ -1,5 +1,5 @@</span><br><span> struct acpi_rsdp;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long mainboard_write_acpi_tables(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long mainboard_write_acpi_tables(struct device *dev,</span><br><span> unsigned long start,</span><br><span> struct acpi_rsdp *rsdp);</span><br><span>diff --git a/src/mainboard/google/chell/mainboard.c b/src/mainboard/google/chell/mainboard.c</span><br><span>index e2cf9ad..920435b 100644</span><br><span>--- a/src/mainboard/google/chell/mainboard.c</span><br><span>+++ b/src/mainboard/google/chell/mainboard.c</span><br><span>@@ -29,7 +29,7 @@</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>diff --git a/src/mainboard/google/eve/mainboard.c b/src/mainboard/google/eve/mainboard.c</span><br><span>index 63dcd75..d7ef1f6 100644</span><br><span>--- a/src/mainboard/google/eve/mainboard.c</span><br><span>+++ b/src/mainboard/google/eve/mainboard.c</span><br><span>@@ -32,7 +32,7 @@</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c</span><br><span>index eb48e40..27639be 100644</span><br><span>--- a/src/mainboard/google/fizz/mainboard.c</span><br><span>+++ b/src/mainboard/google/fizz/mainboard.c</span><br><span>@@ -233,7 +233,7 @@</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> const char *oem_id = "GOOGLE";</span><br><span> const char *oem_table_id = "FIZZ";</span><br><span>diff --git a/src/mainboard/google/glados/mainboard.c b/src/mainboard/google/glados/mainboard.c</span><br><span>index be23f4e..8e406af 100644</span><br><span>--- a/src/mainboard/google/glados/mainboard.c</span><br><span>+++ b/src/mainboard/google/glados/mainboard.c</span><br><span>@@ -29,7 +29,7 @@</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>diff --git a/src/mainboard/google/lars/mainboard.c b/src/mainboard/google/lars/mainboard.c</span><br><span>index 43895fb..788a2ca 100644</span><br><span>--- a/src/mainboard/google/lars/mainboard.c</span><br><span>+++ b/src/mainboard/google/lars/mainboard.c</span><br><span>@@ -29,7 +29,7 @@</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c</span><br><span>index fc533af..5ce7fe6 100644</span><br><span>--- a/src/mainboard/google/octopus/mainboard.c</span><br><span>+++ b/src/mainboard/google/octopus/mainboard.c</span><br><span>@@ -42,7 +42,7 @@</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>diff --git a/src/mainboard/google/poppy/mainboard.c b/src/mainboard/google/poppy/mainboard.c</span><br><span>index b3e91e8..e964261 100644</span><br><span>--- a/src/mainboard/google/poppy/mainboard.c</span><br><span>+++ b/src/mainboard/google/poppy/mainboard.c</span><br><span>@@ -26,7 +26,7 @@</span><br><span> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned long mainboard_write_acpi_tables(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned long mainboard_write_acpi_tables(struct device *dev,</span><br><span> unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span>diff --git a/src/mainboard/google/reef/mainboard.c b/src/mainboard/google/reef/mainboard.c</span><br><span>index 6db9ac6..2111291 100644</span><br><span>--- a/src/mainboard/google/reef/mainboard.c</span><br><span>+++ b/src/mainboard/google/reef/mainboard.c</span><br><span>@@ -108,7 +108,7 @@</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>diff --git a/src/mainboard/google/zoombini/mainboard.c b/src/mainboard/google/zoombini/mainboard.c</span><br><span>index 96e1ac0..e0e88b1 100644</span><br><span>--- a/src/mainboard/google/zoombini/mainboard.c</span><br><span>+++ b/src/mainboard/google/zoombini/mainboard.c</span><br><span>@@ -25,7 +25,7 @@</span><br><span> mainboard_ec_init();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned long mainboard_write_acpi_tables(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned long mainboard_write_acpi_tables(struct device *dev,</span><br><span> unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span>diff --git a/src/mainboard/intel/kunimitsu/mainboard.c b/src/mainboard/intel/kunimitsu/mainboard.c</span><br><span>index c87b565..560c023 100644</span><br><span>--- a/src/mainboard/intel/kunimitsu/mainboard.c</span><br><span>+++ b/src/mainboard/intel/kunimitsu/mainboard.c</span><br><span>@@ -42,7 +42,7 @@</span><br><span> }</span><br><span> </span><br><span> static unsigned long mainboard_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">- struct device *device, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev, unsigned long current, acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span> uintptr_t start_addr;</span><br><span> uintptr_t end_addr;</span><br><span>diff --git a/src/mainboard/iwill/dk8_htx/acpi_tables.c b/src/mainboard/iwill/dk8_htx/acpi_tables.c</span><br><span>index 957be79..91f34de 100644</span><br><span>--- a/src/mainboard/iwill/dk8_htx/acpi_tables.c</span><br><span>+++ b/src/mainboard/iwill/dk8_htx/acpi_tables.c</span><br><span>@@ -123,7 +123,7 @@</span><br><span> return current;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long mainboard_write_acpi_tables(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long mainboard_write_acpi_tables(struct device *dev,</span><br><span> unsigned long start,</span><br><span> acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span>diff --git a/src/mainboard/iwill/dk8_htx/mainboard.h b/src/mainboard/iwill/dk8_htx/mainboard.h</span><br><span>index 111b445..a8bf622 100644</span><br><span>--- a/src/mainboard/iwill/dk8_htx/mainboard.h</span><br><span>+++ b/src/mainboard/iwill/dk8_htx/mainboard.h</span><br><span>@@ -1 +1 @@</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long mainboard_write_acpi_tables(struct device *device, unsigned long start, acpi_rsdp_t *rsdp);</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long mainboard_write_acpi_tables(struct device *dev, unsigned long start, acpi_rsdp_t *rsdp);</span><br><span>diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c</span><br><span>index 1510ab7..6541635 100644</span><br><span>--- a/src/mainboard/lenovo/x200/mainboard.c</span><br><span>+++ b/src/mainboard/lenovo/x200/mainboard.c</span><br><span>@@ -17,7 +17,7 @@</span><br><span> #include <drivers/intel/gma/int15.h></span><br><span> #include <drivers/lenovo/lenovo.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void fill_ssdt(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void fill_ssdt(struct device *dev)</span><br><span> {</span><br><span> drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);</span><br><span> }</span><br><span>diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c</span><br><span>index 59add68..a5912ac 100644</span><br><span>--- a/src/mainboard/lenovo/x201/mainboard.c</span><br><span>+++ b/src/mainboard/lenovo/x201/mainboard.c</span><br><span>@@ -73,7 +73,7 @@</span><br><span> printk(BIOS_SPEW, "SPI configured\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void fill_ssdt(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void fill_ssdt(struct device *dev)</span><br><span> {</span><br><span> drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 0);</span><br><span> }</span><br><span>diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c</span><br><span>index 925779e..33f0cf8 100644</span><br><span>--- a/src/mainboard/lenovo/x60/mainboard.c</span><br><span>+++ b/src/mainboard/lenovo/x60/mainboard.c</span><br><span>@@ -115,7 +115,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void fill_ssdt(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void fill_ssdt(struct device *dev)</span><br><span> {</span><br><span> drivers_lenovo_serial_ports_ssdt_generate("\\_SB.PCI0.LPCB", 1);</span><br><span> }</span><br><span>diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c</span><br><span>index 0ced54b..8ef19c7 100644</span><br><span>--- a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c</span><br><span>+++ b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c</span><br><span>@@ -86,7 +86,7 @@</span><br><span> return current;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void mainboard_inject_dsdt(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+void mainboard_inject_dsdt(struct device *dev)</span><br><span> {</span><br><span> global_vars_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, GLOBAL_VARS_SIZE);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26443">change 26443</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/26443"/><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: I11ca08a4e4947633c03f5382467dec54fd632780 </div>
<div style="display:none"> Gerrit-Change-Number: 26443 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>