<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26445">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">northbridge/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: I7639118913864826a2d7d932795834606865171b<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/northbridge/intel/fsp_rangeley/acpi.c<br>M src/northbridge/intel/fsp_rangeley/northbridge.h<br>M src/northbridge/intel/fsp_sandybridge/gma.c<br>M src/northbridge/intel/gm45/acpi.c<br>M src/northbridge/intel/gm45/gm45.h<br>M src/northbridge/intel/gm45/gma.c<br>M src/northbridge/intel/haswell/gma.c<br>M src/northbridge/intel/haswell/haswell.h<br>M src/northbridge/intel/i945/gma.c<br>M src/northbridge/intel/nehalem/gma.c<br>M src/northbridge/intel/sandybridge/gma.c<br>M src/northbridge/intel/sandybridge/sandybridge.h<br>M src/northbridge/intel/x4x/acpi.c<br>M src/northbridge/intel/x4x/gma.c<br>M src/northbridge/intel/x4x/x4x.h<br>15 files changed, 15 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/26445/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/northbridge/intel/fsp_rangeley/acpi.c b/src/northbridge/intel/fsp_rangeley/acpi.c</span><br><span>index c8e6d45..f86c891 100644</span><br><span>--- a/src/northbridge/intel/fsp_rangeley/acpi.c</span><br><span>+++ b/src/northbridge/intel/fsp_rangeley/acpi.c</span><br><span>@@ -61,7 +61,7 @@</span><br><span> return current;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void northbridge_acpi_fill_ssdt_generator(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+void northbridge_acpi_fill_ssdt_generator(struct device *dev)</span><br><span> {</span><br><span> u32 bmbound;</span><br><span> char pscope[] = "\\_SB.PCI0";</span><br><span>diff --git a/src/northbridge/intel/fsp_rangeley/northbridge.h b/src/northbridge/intel/fsp_rangeley/northbridge.h</span><br><span>index f68d175..ac75f2c 100644</span><br><span>--- a/src/northbridge/intel/fsp_rangeley/northbridge.h</span><br><span>+++ b/src/northbridge/intel/fsp_rangeley/northbridge.h</span><br><span>@@ -73,7 +73,7 @@</span><br><span> void report_platform_info(void);</span><br><span> </span><br><span> #ifndef __SIMPLE_DEVICE__</span><br><span style="color: hsl(0, 100%, 40%);">-void northbridge_acpi_fill_ssdt_generator(struct device *device);</span><br><span style="color: hsl(120, 100%, 40%);">+void northbridge_acpi_fill_ssdt_generator(struct device *dev);</span><br><span> #endif</span><br><span> </span><br><span> #endif /* #ifndef __ASSEMBLER__ */</span><br><span>diff --git a/src/northbridge/intel/fsp_sandybridge/gma.c b/src/northbridge/intel/fsp_sandybridge/gma.c</span><br><span>index 2cfd1f3..c6caf04 100644</span><br><span>--- a/src/northbridge/intel/fsp_sandybridge/gma.c</span><br><span>+++ b/src/northbridge/intel/fsp_sandybridge/gma.c</span><br><span>@@ -89,7 +89,7 @@</span><br><span> return &chip->gfx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gma_ssdt(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gma_ssdt(struct device *dev)</span><br><span> {</span><br><span> const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();</span><br><span> if (!gfx) {</span><br><span>diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c</span><br><span>index 73b098f..fd45adb 100644</span><br><span>--- a/src/northbridge/intel/gm45/acpi.c</span><br><span>+++ b/src/northbridge/intel/gm45/acpi.c</span><br><span>@@ -105,7 +105,7 @@</span><br><span> return current;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long northbridge_write_acpi_tables(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *dev,</span><br><span> unsigned long start,</span><br><span> struct acpi_rsdp *rsdp)</span><br><span> {</span><br><span>diff --git a/src/northbridge/intel/gm45/gm45.h b/src/northbridge/intel/gm45/gm45.h</span><br><span>index 56c6fea..c0fccde 100644</span><br><span>--- a/src/northbridge/intel/gm45/gm45.h</span><br><span>+++ b/src/northbridge/intel/gm45/gm45.h</span><br><span>@@ -448,7 +448,7 @@</span><br><span> #include <device/device.h></span><br><span> </span><br><span> struct acpi_rsdp;</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long northbridge_write_acpi_tables(struct device *device, unsigned long start, struct acpi_rsdp *rsdp);</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *dev, unsigned long start, struct acpi_rsdp *rsdp);</span><br><span> #endif</span><br><span> </span><br><span> #endif /* !__ACPI__ */</span><br><span>diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c</span><br><span>index 237071c..361c249 100644</span><br><span>--- a/src/northbridge/intel/gm45/gma.c</span><br><span>+++ b/src/northbridge/intel/gm45/gma.c</span><br><span>@@ -801,7 +801,7 @@</span><br><span> return &chip->gfx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gma_ssdt(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gma_ssdt(struct device *dev)</span><br><span> {</span><br><span> const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();</span><br><span> if (!gfx) {</span><br><span>diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c</span><br><span>index 8ffdce8..996345f 100644</span><br><span>--- a/src/northbridge/intel/haswell/gma.c</span><br><span>+++ b/src/northbridge/intel/haswell/gma.c</span><br><span>@@ -510,7 +510,7 @@</span><br><span> return &chip->gfx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gma_ssdt(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gma_ssdt(struct device *dev)</span><br><span> {</span><br><span> const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();</span><br><span> if (!gfx) {</span><br><span>diff --git a/src/northbridge/intel/haswell/haswell.h b/src/northbridge/intel/haswell/haswell.h</span><br><span>index d8868a1..88b2222 100644</span><br><span>--- a/src/northbridge/intel/haswell/haswell.h</span><br><span>+++ b/src/northbridge/intel/haswell/haswell.h</span><br><span>@@ -234,7 +234,7 @@</span><br><span> #include <device/device.h></span><br><span> </span><br><span> struct acpi_rsdp;</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long northbridge_write_acpi_tables(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *dev,</span><br><span> unsigned long start, struct acpi_rsdp *rsdp);</span><br><span> #endif</span><br><span> </span><br><span>diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c</span><br><span>index 6c3d6ae..8d9508b 100644</span><br><span>--- a/src/northbridge/intel/i945/gma.c</span><br><span>+++ b/src/northbridge/intel/i945/gma.c</span><br><span>@@ -770,7 +770,7 @@</span><br><span> return &chip->gfx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gma_ssdt(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gma_ssdt(struct device *dev)</span><br><span> {</span><br><span> const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();</span><br><span> if (!gfx)</span><br><span>diff --git a/src/northbridge/intel/nehalem/gma.c b/src/northbridge/intel/nehalem/gma.c</span><br><span>index 6b8b98e..f4a4aef 100644</span><br><span>--- a/src/northbridge/intel/nehalem/gma.c</span><br><span>+++ b/src/northbridge/intel/nehalem/gma.c</span><br><span>@@ -1122,7 +1122,7 @@</span><br><span> return &chip->gfx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gma_ssdt(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gma_ssdt(struct device *dev)</span><br><span> {</span><br><span> const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();</span><br><span> if (!gfx) {</span><br><span>diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c</span><br><span>index 201498a..86f843e 100644</span><br><span>--- a/src/northbridge/intel/sandybridge/gma.c</span><br><span>+++ b/src/northbridge/intel/sandybridge/gma.c</span><br><span>@@ -684,7 +684,7 @@</span><br><span> return &chip->gfx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gma_ssdt(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gma_ssdt(struct device *dev)</span><br><span> {</span><br><span> const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();</span><br><span> if (!gfx) {</span><br><span>diff --git a/src/northbridge/intel/sandybridge/sandybridge.h b/src/northbridge/intel/sandybridge/sandybridge.h</span><br><span>index e81d3bf..75195c5 100644</span><br><span>--- a/src/northbridge/intel/sandybridge/sandybridge.h</span><br><span>+++ b/src/northbridge/intel/sandybridge/sandybridge.h</span><br><span>@@ -230,7 +230,7 @@</span><br><span> #include <device/device.h></span><br><span> </span><br><span> struct acpi_rsdp;</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long northbridge_write_acpi_tables(struct device *device, unsigned long start, struct acpi_rsdp *rsdp);</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *dev, unsigned long start, struct acpi_rsdp *rsdp);</span><br><span> #endif</span><br><span> </span><br><span> #endif</span><br><span>diff --git a/src/northbridge/intel/x4x/acpi.c b/src/northbridge/intel/x4x/acpi.c</span><br><span>index 678486c..b9fb739 100644</span><br><span>--- a/src/northbridge/intel/x4x/acpi.c</span><br><span>+++ b/src/northbridge/intel/x4x/acpi.c</span><br><span>@@ -44,7 +44,7 @@</span><br><span> return current;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long northbridge_write_acpi_tables(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *dev,</span><br><span> unsigned long start,</span><br><span> struct acpi_rsdp *rsdp)</span><br><span> {</span><br><span>diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c</span><br><span>index 8ce1a5d..11ba378 100644</span><br><span>--- a/src/northbridge/intel/x4x/gma.c</span><br><span>+++ b/src/northbridge/intel/x4x/gma.c</span><br><span>@@ -453,7 +453,7 @@</span><br><span> return &chip->gfx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gma_ssdt(struct device *device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gma_ssdt(struct device *dev)</span><br><span> {</span><br><span> const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();</span><br><span> if (!gfx)</span><br><span>diff --git a/src/northbridge/intel/x4x/x4x.h b/src/northbridge/intel/x4x/x4x.h</span><br><span>index 8532d60..0104bc7 100644</span><br><span>--- a/src/northbridge/intel/x4x/x4x.h</span><br><span>+++ b/src/northbridge/intel/x4x/x4x.h</span><br><span>@@ -391,7 +391,7 @@</span><br><span> </span><br><span> struct acpi_rsdp;</span><br><span> #ifndef __SIMPLE_DEVICE__</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long northbridge_write_acpi_tables(struct device *device,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *dev,</span><br><span> unsigned long start, struct acpi_rsdp *rsdp);</span><br><span> #endif /* __SIMPLE_DEVICE__ */</span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26445">change 26445</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/26445"/><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: I7639118913864826a2d7d932795834606865171b </div>
<div style="display:none"> Gerrit-Change-Number: 26445 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>