<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23667">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nb/intel/gm45: Get rid off device_t<br><br>Use of `device_t` has been<br>abandoned in ramstage<br><br>Change-Id: If064a4027265e8fc2ea919d9742a554abf29b8db<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<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/gm45/northbridge.c<br>4 files changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/23667/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c</span><br><span>index b90afca..73b098f 100644</span><br><span>--- a/src/northbridge/intel/gm45/acpi.c</span><br><span>+++ b/src/northbridge/intel/gm45/acpi.c</span><br><span>@@ -29,7 +29,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 pciexbar_reg;</span><br><span> int max_buses;</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(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/gm45/gm45.h b/src/northbridge/intel/gm45/gm45.h</span><br><span>index 34f734c..ecf7811 100644</span><br><span>--- a/src/northbridge/intel/gm45/gm45.h</span><br><span>+++ b/src/northbridge/intel/gm45/gm45.h</span><br><span>@@ -447,7 +447,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(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, 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 bdad49b..db9fe1d 100644</span><br><span>--- a/src/northbridge/intel/gm45/gma.c</span><br><span>+++ b/src/northbridge/intel/gm45/gma.c</span><br><span>@@ -778,7 +778,7 @@</span><br><span> intel_gma_restore_opregion();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void gma_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void gma_set_subsystem(struct device *dev, unsigned vendor, unsigned device)</span><br><span> {</span><br><span> if (!vendor || !device) {</span><br><span> pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,</span><br><span>@@ -793,7 +793,7 @@</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%);">+ device *dev = dev_find_slot(0, PCI_DEVFN(0x2,0));</span><br><span> if (!dev) {</span><br><span> return NULL;</span><br><span> }</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(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/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c</span><br><span>index 8215979..c6b9888 100644</span><br><span>--- a/src/northbridge/intel/gm45/northbridge.c</span><br><span>+++ b/src/northbridge/intel/gm45/northbridge.c</span><br><span>@@ -41,7 +41,7 @@</span><br><span> *base = 0;</span><br><span> *len = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- const device_t dev = dev_find_slot(0, PCI_DEVFN(0, 0));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev = dev_find_slot(0, PCI_DEVFN(0, 0));</span><br><span> if (!dev)</span><br><span> return 0;</span><br><span> </span><br><span>@@ -68,7 +68,7 @@</span><br><span> return 0;</span><br><span> }</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> u64 tom, touud;</span><br><span> u32 tomk, tolud, uma_sizek = 0;</span><br><span>@@ -161,7 +161,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 *resource;</span><br><span> int i;</span><br><span>@@ -176,7 +176,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>@@ -198,7 +198,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>@@ -211,7 +211,7 @@</span><br><span> .scan_bus = 0,</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></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23667">change 23667</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/23667"/><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: If064a4027265e8fc2ea919d9742a554abf29b8db </div>
<div style="display:none"> Gerrit-Change-Number: 23667 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>