<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23655">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nb/x4x: Get rid off device_t<br><br>Use of `device_t` has been abandoned in ramstage<br><br>Change-Id: Ib3e708a7fa9f0a78dc704a502a2f01ee0fe209ae<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/northbridge/intel/x4x/acpi.c<br>M src/northbridge/intel/x4x/gma.c<br>M src/northbridge/intel/x4x/northbridge.c<br>M src/northbridge/intel/x4x/x4x.h<br>4 files changed, 12 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/23655/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/northbridge/intel/x4x/acpi.c b/src/northbridge/intel/x4x/acpi.c</span><br><span>index 21f7aa9..678486c 100644</span><br><span>--- a/src/northbridge/intel/x4x/acpi.c</span><br><span>+++ b/src/northbridge/intel/x4x/acpi.c</span><br><span>@@ -30,7 +30,7 @@</span><br><span> </span><br><span> unsigned long acpi_fill_mcfg(unsigned long current)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-       device_t dev;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span>  u32 pciexbar = 0;</span><br><span>    u32 length = 0;</span><br><span> </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(device_t device,</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *device,</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 cf3804d..8ce1a5d 100644</span><br><span>--- a/src/northbridge/intel/x4x/gma.c</span><br><span>+++ b/src/northbridge/intel/x4x/gma.c</span><br><span>@@ -430,7 +430,7 @@</span><br><span>      pci_write_config16(dev_host, D0F0_GGC, ggc);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gma_set_subsystem(device_t dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+static void gma_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span>                        unsigned int device)</span><br><span> {</span><br><span>    if (!vendor || !device) {</span><br><span>@@ -446,14 +446,14 @@</span><br><span> const struct i915_gpu_controller_info *</span><br><span> intel_gma_get_controller_info(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        device_t dev = dev_find_slot(0, PCI_DEVFN(0x2, 0));</span><br><span style="color: hsl(120, 100%, 40%);">+   struct device *dev = dev_find_slot(0, PCI_DEVFN(0x2, 0));</span><br><span>    if (!dev)</span><br><span>            return NULL;</span><br><span>         struct northbridge_intel_x4x_config *chip = dev->chip_info;</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(device_t device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gma_ssdt(struct device *device)</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/northbridge.c b/src/northbridge/intel/x4x/northbridge.c</span><br><span>index 6ba45fe..e51c587 100644</span><br><span>--- a/src/northbridge/intel/x4x/northbridge.c</span><br><span>+++ b/src/northbridge/intel/x4x/northbridge.c</span><br><span>@@ -31,7 +31,7 @@</span><br><span> </span><br><span> static const int legacy_hole_base_k = 0xa0000 / 1024;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mch_domain_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mch_domain_read_resources(struct device *dev)</span><br><span> {</span><br><span>   u8 index, reg8;</span><br><span>      u64 tom, touud;</span><br><span>@@ -136,7 +136,7 @@</span><br><span>        }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mch_domain_set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mch_domain_set_resources(struct device *dev)</span><br><span> {</span><br><span>  struct resource *res;</span><br><span> </span><br><span>@@ -146,7 +146,7 @@</span><br><span>      assign_resources(dev->link_list);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mch_domain_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mch_domain_init(struct device *dev)</span><br><span> {</span><br><span>         u32 reg32;</span><br><span> </span><br><span>@@ -167,7 +167,7 @@</span><br><span> };</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void cpu_bus_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void cpu_bus_init(struct device *dev)</span><br><span> {</span><br><span>  initialize_cpus(dev->link_list);</span><br><span> }</span><br><span>@@ -180,7 +180,7 @@</span><br><span> };</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void enable_dev(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void enable_dev(struct device *dev)</span><br><span> {</span><br><span>    /* Set the operations if it is a special bus type */</span><br><span>         if (dev->path.type == DEVICE_PATH_DOMAIN)</span><br><span>diff --git a/src/northbridge/intel/x4x/x4x.h b/src/northbridge/intel/x4x/x4x.h</span><br><span>index cbb1853..6904cb8 100644</span><br><span>--- a/src/northbridge/intel/x4x/x4x.h</span><br><span>+++ b/src/northbridge/intel/x4x/x4x.h</span><br><span>@@ -338,7 +338,8 @@</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(device_t 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 *device,</span><br><span style="color: hsl(120, 100%, 40%);">+               unsigned long start, struct acpi_rsdp *rsdp);</span><br><span> #endif /* __SIMPLE_DEVICE__ */</span><br><span> #endif</span><br><span> #endif /* __NORTHBRIDGE_INTEL_X4X_H__ */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23655">change 23655</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/23655"/><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: Ib3e708a7fa9f0a78dc704a502a2f01ee0fe209ae </div>
<div style="display:none"> Gerrit-Change-Number: 23655 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>