<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26067">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/device: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: I7bd8b93922f113bdaf7ba460acf6a7d62c4df013<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/device/cpu_device.c<br>M src/device/device.c<br>M src/device/device_util.c<br>M src/device/hypertransport.c<br>M src/device/pci_rom.c<br>5 files changed, 18 insertions(+), 18 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/26067/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/device/cpu_device.c b/src/device/cpu_device.c</span><br><span>index ccbe6ec..4abb791 100644</span><br><span>--- a/src/device/cpu_device.c</span><br><span>+++ b/src/device/cpu_device.c</span><br><span>@@ -17,10 +17,10 @@</span><br><span> #include <device/device.h></span><br><span> #include <console/console.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-device_t add_cpu_device(struct bus *cpu_bus, unsigned apic_id, int enabled)</span><br><span style="color: hsl(120, 100%, 40%);">+struct device *add_cpu_device(struct bus *cpu_bus, unsigned apic_id, int enabled)</span><br><span> {</span><br><span> struct device_path cpu_path;</span><br><span style="color: hsl(0, 100%, 40%);">- device_t cpu;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *cpu;</span><br><span> </span><br><span> /* Build the CPU device path */</span><br><span> cpu_path.type = DEVICE_PATH_APIC;</span><br><span>@@ -41,7 +41,7 @@</span><br><span> return cpu;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void set_cpu_topology(device_t cpu, unsigned node, unsigned package, unsigned core, unsigned thread)</span><br><span style="color: hsl(120, 100%, 40%);">+void set_cpu_topology(struct device *cpu, unsigned node, unsigned package, unsigned core, unsigned thread)</span><br><span> {</span><br><span> cpu->path.apic.node_id = node;</span><br><span> cpu->path.apic.package_id = package;</span><br><span>diff --git a/src/device/device.c b/src/device/device.c</span><br><span>index b896f5e..1222345 100644</span><br><span>--- a/src/device/device.c</span><br><span>+++ b/src/device/device.c</span><br><span>@@ -122,7 +122,7 @@</span><br><span> */</span><br><span> static device_t __alloc_dev(struct bus *parent, struct device_path *path)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t dev, child;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev, child;</span><br><span> </span><br><span> /* Find the last child of our parent. */</span><br><span> for (child = parent->children; child && child->sibling; /* */ )</span><br><span>@@ -154,9 +154,9 @@</span><br><span> return dev;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-device_t alloc_dev(struct bus *parent, struct device_path *path)</span><br><span style="color: hsl(120, 100%, 40%);">+struct device *alloc_dev(struct bus *parent, struct device_path *path)</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> spin_lock(&dev_lock);</span><br><span> dev = __alloc_dev(parent, path);</span><br><span> spin_unlock(&dev_lock);</span><br><span>@@ -170,9 +170,9 @@</span><br><span> * @param path The relative path from the bus to the appropriate device.</span><br><span> * @return Pointer to a device structure for the device on bus at path.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-device_t alloc_find_dev(struct bus *parent, struct device_path *path)</span><br><span style="color: hsl(120, 100%, 40%);">+struct device *alloc_find_dev(struct bus *parent, struct device_path *path)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t child;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *child;</span><br><span> spin_lock(&dev_lock);</span><br><span> child = find_dev_path(parent, path);</span><br><span> if (!child)</span><br><span>@@ -754,7 +754,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-device_t vga_pri = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+struct device *vga_pri = 0;</span><br><span> static void set_vga_bridge_bits(void)</span><br><span> {</span><br><span> /*</span><br><span>diff --git a/src/device/device_util.c b/src/device/device_util.c</span><br><span>index a64b63a..1975dcf 100644</span><br><span>--- a/src/device/device_util.c</span><br><span>+++ b/src/device/device_util.c</span><br><span>@@ -138,7 +138,7 @@</span><br><span> * @param path_type The Device Path Type.</span><br><span> * @return Pointer to the device structure (if found), 0 otherwise.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-struct device *dev_find_path(device_t prev_match,</span><br><span style="color: hsl(120, 100%, 40%);">+struct device *dev_find_path(struct device *prev_match,</span><br><span> enum device_path_type path_type)</span><br><span> {</span><br><span> struct device *dev;</span><br><span>diff --git a/src/device/hypertransport.c b/src/device/hypertransport.c</span><br><span>index 472adfc..9712585 100644</span><br><span>--- a/src/device/hypertransport.c</span><br><span>+++ b/src/device/hypertransport.c</span><br><span>@@ -34,9 +34,9 @@</span><br><span> unsigned char ctrl_off, config_off, freq_off, freq_cap_off;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static device_t ht_scan_get_devs(device_t *old_devices)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *ht_scan_get_devs(device_t *old_devices)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t first, last;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *first, last;</span><br><span> </span><br><span> first = *old_devices;</span><br><span> last = first;</span><br><span>@@ -53,7 +53,7 @@</span><br><span> }</span><br><span> </span><br><span> if (first) {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t child;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *child;</span><br><span> </span><br><span> /* Unlink the chain from the list of old devices. */</span><br><span> *old_devices = last->sibling;</span><br><span>@@ -73,7 +73,7 @@</span><br><span> return first;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int ht_setup_link(struct ht_link *prev, device_t dev, unsigned pos)</span><br><span style="color: hsl(120, 100%, 40%);">+static int ht_setup_link(struct ht_link *prev, struct device *dev, unsigned pos)</span><br><span> {</span><br><span> struct ht_link cur[1];</span><br><span> int linkb_to_host;</span><br><span>@@ -256,7 +256,7 @@</span><br><span> * optimize link.</span><br><span> */</span><br><span> unsigned int next_unitid, last_unitid, min_unitid, max_unitid;</span><br><span style="color: hsl(0, 100%, 40%);">- device_t old_devices, dev, func, last_func = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *old_devices, dev, func, last_func = 0;</span><br><span> struct ht_link prev;</span><br><span> int ht_dev_num = 0;</span><br><span> </span><br><span>@@ -271,7 +271,7 @@</span><br><span> */</span><br><span> unsigned int real_last_unitid = 0, end_used = 0;</span><br><span> u8 real_last_pos = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- device_t real_last_dev = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *real_last_dev = NULL;</span><br><span> #endif</span><br><span> </span><br><span> /* Restore the hypertransport chain to it's uninitialized state. */</span><br><span>@@ -458,7 +458,7 @@</span><br><span> * a problem in devicetree.cb.</span><br><span> */</span><br><span> if (old_devices) {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t left;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *left;</span><br><span> for (left = old_devices; left; left = left->sibling)</span><br><span> printk(BIOS_DEBUG, "%s\n", dev_path(left));</span><br><span> </span><br><span>diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c</span><br><span>index 299f7c8..ad4c8e1 100644</span><br><span>--- a/src/device/pci_rom.c</span><br><span>+++ b/src/device/pci_rom.c</span><br><span>@@ -153,7 +153,7 @@</span><br><span> */</span><br><span> if (PCI_CLASS_DISPLAY_VGA == (dev->class >> 8)) {</span><br><span> #if !IS_ENABLED(CONFIG_MULTIPLE_VGA_ADAPTERS)</span><br><span style="color: hsl(0, 100%, 40%);">- extern device_t vga_pri; /* Primary VGA device (device.c). */</span><br><span style="color: hsl(120, 100%, 40%);">+ extern struct device *vga_pri; /* Primary VGA device (device.c). */</span><br><span> if (dev != vga_pri) return NULL; /* Only one VGA supported. */</span><br><span> #endif</span><br><span> if ((void *)PCI_VGA_RAM_IMAGE_START != rom_header) {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26067">change 26067</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/26067"/><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: I7bd8b93922f113bdaf7ba460acf6a7d62c4df013 </div>
<div style="display:none"> Gerrit-Change-Number: 26067 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>