<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26199">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nb/amd/agesa/family14: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: I9841fa591c4051653267b9e7c2f5b347d6f25b74<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/northbridge/amd/agesa/family14/amdfam14_conf.c<br>M src/northbridge/amd/agesa/family14/northbridge.c<br>2 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/99/26199/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/northbridge/amd/agesa/family14/amdfam14_conf.c b/src/northbridge/amd/agesa/family14/amdfam14_conf.c</span><br><span>index 5de7a05..db46f53 100644</span><br><span>--- a/src/northbridge/amd/agesa/family14/amdfam14_conf.c</span><br><span>+++ b/src/northbridge/amd/agesa/family14/amdfam14_conf.c</span><br><span>@@ -24,7 +24,7 @@</span><br><span> </span><br><span> static struct dram_base_mask_t get_dram_base_mask(u32 nodeid)</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>  struct dram_base_mask_t d;</span><br><span> #if defined(__PRE_RAM__)</span><br><span>       dev = PCI_DEV(CONFIG_CBB, CONFIG_CDB, 1);</span><br><span>@@ -50,7 +50,7 @@</span><br><span> {</span><br><span>   u32 i;</span><br><span>       u32 tempreg;</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> </span><br><span>      /* io range allocation */</span><br><span>    tempreg = (nodeid&0xf) | ((nodeid & 0x30)<<(8-4)) | (linkn << 4) |  ((io_max&0xf0)<<(12-4)); //limit</span><br><span>@@ -70,7 +70,7 @@</span><br><span>                                       u32 io_min, u32 io_max, u32 nodes)</span><br><span> {</span><br><span>      u32 i;</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> </span><br><span>       /* io range allocation */</span><br><span>   for (i = 0; i < nodes; i++) {</span><br><span>@@ -92,7 +92,7 @@</span><br><span>         return   0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void set_io_addr_reg(device_t dev, u32 nodeid, u32 linkn, u32 reg,</span><br><span style="color: hsl(120, 100%, 40%);">+static void set_io_addr_reg(struct device *dev, u32 nodeid, u32 linkn, u32 reg,</span><br><span>                               u32 io_min, u32 io_max)</span><br><span> {</span><br><span> </span><br><span>diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c</span><br><span>index ab444bd..e2f6ff6 100644</span><br><span>--- a/src/northbridge/amd/agesa/family14/northbridge.c</span><br><span>+++ b/src/northbridge/amd/agesa/family14/northbridge.c</span><br><span>@@ -82,7 +82,7 @@</span><br><span>    if (fx_devs == 0)</span><br><span>            get_fx_devs();</span><br><span>       for (i = 0; i < fx_devs; i++) {</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>          dev = __f1_dev[i];</span><br><span>           if (dev && dev->enabled) {</span><br><span>                        pci_write_config32(dev, reg, value);</span><br><span>@@ -90,14 +90,14 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static u32 amdfam14_nodeid(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static u32 amdfam14_nodeid(struct device *dev)</span><br><span> {</span><br><span>      return (dev->path.pci.devfn >> 3) - CONFIG_CDB;</span><br><span> }</span><br><span> </span><br><span> #include "amdfam14_conf.c"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void northbridge_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void northbridge_init(struct device *dev)</span><br><span> {</span><br><span>       printk(BIOS_DEBUG, "Northbridge init\n");</span><br><span> }</span><br><span>@@ -113,7 +113,7 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int reg_useable(unsigned reg, device_t goal_dev, unsigned goal_nodeid,</span><br><span style="color: hsl(120, 100%, 40%);">+static int reg_useable(unsigned reg, struct device *goal_dev, unsigned goal_nodeid,</span><br><span>                       unsigned goal_link)</span><br><span> {</span><br><span>      struct resource *res;</span><br><span>@@ -121,7 +121,7 @@</span><br><span>  int result;</span><br><span>  res = 0;</span><br><span>     for (nodeid = 0; !res && (nodeid < fx_devs); nodeid++) {</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>          dev = __f0_dev[nodeid];</span><br><span>              if (!dev)</span><br><span>                    continue;</span><br><span>@@ -140,7 +140,7 @@</span><br><span>      return result;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct resource *amdfam14_find_iopair(device_t dev, unsigned nodeid,</span><br><span style="color: hsl(120, 100%, 40%);">+static struct resource *amdfam14_find_iopair(struct device *dev, unsigned nodeid,</span><br><span>                                             unsigned link)</span><br><span> {</span><br><span>     struct resource *resource;</span><br><span>@@ -167,7 +167,7 @@</span><br><span>     return resource;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct resource *amdfam14_find_mempair(device_t dev, u32 nodeid,</span><br><span style="color: hsl(120, 100%, 40%);">+static struct resource *amdfam14_find_mempair(struct device *dev, u32 nodeid,</span><br><span>                                            u32 link)</span><br><span> {</span><br><span>         struct resource *resource;</span><br><span>@@ -202,7 +202,7 @@</span><br><span>     return resource;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdfam14_link_read_bases(device_t dev, u32 nodeid, u32 link)</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdfam14_link_read_bases(struct device *dev, u32 nodeid, u32 link)</span><br><span> {</span><br><span>       struct resource *resource;</span><br><span> </span><br><span>@@ -283,7 +283,7 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void nb_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void nb_read_resources(struct device *dev)</span><br><span> {</span><br><span>   u32 nodeid;</span><br><span>  struct bus *link;</span><br><span>@@ -305,7 +305,7 @@</span><br><span>      mmconf_resource(dev, 0xc0010058);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void set_resource(device_t dev, struct resource *resource, u32 nodeid)</span><br><span style="color: hsl(120, 100%, 40%);">+static void set_resource(struct device *dev, struct resource *resource, u32 nodeid)</span><br><span> {</span><br><span>    resource_t rbase, rend;</span><br><span>      unsigned reg, link_num;</span><br><span>@@ -357,7 +357,7 @@</span><br><span> extern device_t vga_pri;       // the primary vga device, defined in device.c</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void create_vga_resource(device_t dev, unsigned nodeid)</span><br><span style="color: hsl(120, 100%, 40%);">+static void create_vga_resource(struct device *dev, unsigned nodeid)</span><br><span> {</span><br><span>        struct bus *link;</span><br><span> </span><br><span>@@ -389,7 +389,7 @@</span><br><span>  set_vga_enable_reg(nodeid, link->link_num);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void nb_set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void nb_set_resources(struct device *dev)</span><br><span> {</span><br><span>     unsigned nodeid;</span><br><span>     struct bus *bus;</span><br><span>@@ -416,7 +416,7 @@</span><br><span> </span><br><span> /* Domain/Root Complex related code */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void domain_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void domain_read_resources(struct device *dev)</span><br><span> {</span><br><span>  unsigned reg;</span><br><span> </span><br><span>@@ -431,7 +431,7 @@</span><br><span>              /* Is this register allocated? */</span><br><span>            if ((base & 3) != 0) {</span><br><span>                   unsigned nodeid, reg_link;</span><br><span style="color: hsl(0, 100%, 40%);">-                      device_t reg_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+                     struct device *reg_dev;</span><br><span>                      if (reg < 0xc0) {    // mmio</span><br><span>                              nodeid = (limit & 0xf) + (base & 0x30);</span><br><span>                      } else {        // io</span><br><span>@@ -458,7 +458,7 @@</span><br><span>  pci_domain_read_resources(dev);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void domain_set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void domain_set_resources(struct device *dev)</span><br><span> {</span><br><span>    printk(BIOS_DEBUG, "\nFam14h - %s\n", __func__);</span><br><span>   printk(BIOS_DEBUG, "  amsr - incoming dev = %p\n", dev);</span><br><span>@@ -592,7 +592,7 @@</span><br><span> static void cpu_bus_scan(struct device *dev)</span><br><span> {</span><br><span>        struct bus *cpu_bus = dev->link_list;</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>  int apic_id, cores_found;</span><br><span> </span><br><span>        /* There is only one node for fam14, but there may be multiple cores. */</span><br><span>@@ -610,7 +610,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></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26199">change 26199</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/26199"/><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: I9841fa591c4051653267b9e7c2f5b347d6f25b74 </div>
<div style="display:none"> Gerrit-Change-Number: 26199 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>