<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26427">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nb/amd/amdk8: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: If540a8b0afb93c1ba8e901c4771228a43c1e6a14<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/northbridge/amd/amdk8/acpi.c<br>M src/northbridge/amd/amdk8/acpi.h<br>M src/northbridge/amd/amdk8/get_sblk_pci1234.c<br>M src/northbridge/amd/amdk8/misc_control.c<br>M src/northbridge/amd/amdk8/northbridge.c<br>M src/northbridge/amd/amdk8/northbridge.h<br>M src/northbridge/amd/amdk8/raminit_test.c<br>M src/northbridge/amd/amdk8/util.c<br>8 files changed, 57 insertions(+), 57 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/27/26427/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/northbridge/amd/amdk8/acpi.c b/src/northbridge/amd/amdk8/acpi.c</span><br><span>index 2fbe7aa..0d42911 100644</span><br><span>--- a/src/northbridge/amd/amdk8/acpi.c</span><br><span>+++ b/src/northbridge/amd/amdk8/acpi.c</span><br><span>@@ -33,7 +33,7 @@</span><br><span> </span><br><span> unsigned long acpi_create_madt_lapic_nmis(unsigned long current, u16 flags, u8 lint)</span><br><span> {</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 cpu_index = 0;</span><br><span> </span><br><span>       for (cpu = all_devices; cpu; cpu = cpu->next) {</span><br><span>@@ -52,7 +52,7 @@</span><br><span> </span><br><span> unsigned long acpi_create_srat_lapics(unsigned long current)</span><br><span> {</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 cpu_index = 0;</span><br><span> </span><br><span>       for (cpu = all_devices; cpu; cpu = cpu->next) {</span><br><span>@@ -171,7 +171,7 @@</span><br><span> }</span><br><span> </span><br><span> unsigned long northbridge_write_acpi_tables(</span><br><span style="color: hsl(0, 100%, 40%);">-               device_t device,</span><br><span style="color: hsl(120, 100%, 40%);">+              struct device *device,</span><br><span>               unsigned long start,</span><br><span>                 acpi_rsdp_t *rsdp)</span><br><span> {</span><br><span>@@ -230,7 +230,7 @@</span><br><span> }</span><br><span> </span><br><span> static void k8acpi_write_pci_data(int dlen, const char *name, int offset) {</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>  uint32_t dword;</span><br><span>      int i;</span><br><span> </span><br><span>@@ -246,7 +246,7 @@</span><br><span>     acpigen_pop_len();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void k8acpi_write_vars(device_t device)</span><br><span style="color: hsl(120, 100%, 40%);">+void k8acpi_write_vars(struct device *device)</span><br><span> {</span><br><span>       /*</span><br><span>    * If more than one physical CPU is installed k8acpi_write_vars()</span><br><span>diff --git a/src/northbridge/amd/amdk8/acpi.h b/src/northbridge/amd/amdk8/acpi.h</span><br><span>index 80e88c1..f8605c6 100644</span><br><span>--- a/src/northbridge/amd/amdk8/acpi.h</span><br><span>+++ b/src/northbridge/amd/amdk8/acpi.h</span><br><span>@@ -17,7 +17,7 @@</span><br><span> #define AMDK8_ACPI_H</span><br><span> #include <arch/acpigen.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void k8acpi_write_vars(device_t device);</span><br><span style="color: hsl(0, 100%, 40%);">-unsigned long northbridge_write_acpi_tables(device_t device, unsigned long start, acpi_rsdp_t *rsdp);</span><br><span style="color: hsl(120, 100%, 40%);">+void k8acpi_write_vars(struct device *device);</span><br><span style="color: hsl(120, 100%, 40%);">+unsigned long northbridge_write_acpi_tables(struct device *device, unsigned long start, acpi_rsdp_t *rsdp);</span><br><span> </span><br><span> #endif</span><br><span>diff --git a/src/northbridge/amd/amdk8/get_sblk_pci1234.c b/src/northbridge/amd/amdk8/get_sblk_pci1234.c</span><br><span>index 1343ae4..fd9584f 100644</span><br><span>--- a/src/northbridge/amd/amdk8/get_sblk_pci1234.c</span><br><span>+++ b/src/northbridge/amd/amdk8/get_sblk_pci1234.c</span><br><span>@@ -142,7 +142,7 @@</span><br><span> void get_sblk_pci1234(void)</span><br><span> {</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>  int i,j;</span><br><span>     uint32_t dword;</span><br><span> </span><br><span>diff --git a/src/northbridge/amd/amdk8/misc_control.c b/src/northbridge/amd/amdk8/misc_control.c</span><br><span>index c472edf..9d2270d 100644</span><br><span>--- a/src/northbridge/amd/amdk8/misc_control.c</span><br><span>+++ b/src/northbridge/amd/amdk8/misc_control.c</span><br><span>@@ -35,7 +35,7 @@</span><br><span>  * implemented in a way to NOT DOING legacy VGA resource allocation on</span><br><span>  * purpose :-(.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void mcf3_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mcf3_read_resources(struct device *dev)</span><br><span> {</span><br><span>      struct resource *resource;</span><br><span>   unsigned char iommu;</span><br><span>@@ -61,13 +61,13 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void set_agp_aperture(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void set_agp_aperture(struct device *dev)</span><br><span> {</span><br><span>  struct resource *resource;</span><br><span> </span><br><span>       resource = probe_resource(dev, 0x94);</span><br><span>        if (resource) {</span><br><span style="color: hsl(0, 100%, 40%);">-         device_t pdev;</span><br><span style="color: hsl(120, 100%, 40%);">+                struct device *pdev;</span><br><span>                 uint32_t gart_base, gart_acr;</span><br><span> </span><br><span>            /* Remember this resource has been stored */</span><br><span>@@ -97,7 +97,7 @@</span><br><span>     }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mcf3_set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mcf3_set_resources(struct device *dev)</span><br><span> {</span><br><span>      /* Set the gart apeture */</span><br><span>   set_agp_aperture(dev);</span><br><span>diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c</span><br><span>index 0a16db4..d22c3c9 100644</span><br><span>--- a/src/northbridge/amd/amdk8/northbridge.c</span><br><span>+++ b/src/northbridge/amd/amdk8/northbridge.c</span><br><span>@@ -40,8 +40,8 @@</span><br><span> struct amdk8_sysconf_t sysconf;</span><br><span> </span><br><span> #define MAX_FX_DEVS 8</span><br><span style="color: hsl(0, 100%, 40%);">-static device_t __f0_dev[MAX_FX_DEVS];</span><br><span style="color: hsl(0, 100%, 40%);">-static device_t __f1_dev[MAX_FX_DEVS];</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *__f0_dev[MAX_FX_DEVS];</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *__f1_dev[MAX_FX_DEVS];</span><br><span> static unsigned fx_devs = 0;</span><br><span> </span><br><span> static void get_fx_devs(void)</span><br><span>@@ -71,7 +71,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>@@ -127,7 +127,7 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static u32 amdk8_nodeid(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static u32 amdk8_nodeid(struct device *dev)</span><br><span> {</span><br><span>    return (dev->path.pci.devfn >> 3) - 0x18;</span><br><span> }</span><br><span>@@ -245,7 +245,7 @@</span><br><span>        }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdk8_scan_chains(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdk8_scan_chains(struct device *dev)</span><br><span> {</span><br><span>        struct bus *link;</span><br><span> </span><br><span>@@ -258,7 +258,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>@@ -266,7 +266,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>@@ -286,7 +286,7 @@</span><br><span>      return result;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned amdk8_find_reg(device_t dev, unsigned nodeid, unsigned link,</span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned amdk8_find_reg(struct device *dev, unsigned nodeid, unsigned link,</span><br><span>                             unsigned min, unsigned max)</span><br><span> {</span><br><span>      unsigned resource;</span><br><span>@@ -314,17 +314,17 @@</span><br><span>   return resource;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned amdk8_find_iopair(device_t dev, unsigned nodeid, unsigned link)</span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned amdk8_find_iopair(struct device *dev, unsigned nodeid, unsigned link)</span><br><span> {</span><br><span>         return amdk8_find_reg(dev, nodeid, link, 0xc0, 0xd8);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static unsigned amdk8_find_mempair(device_t dev, unsigned nodeid, unsigned link)</span><br><span style="color: hsl(120, 100%, 40%);">+static unsigned amdk8_find_mempair(struct device *dev, unsigned nodeid, unsigned link)</span><br><span> {</span><br><span>  return amdk8_find_reg(dev, nodeid, link, 0x80, 0xb8);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdk8_link_read_bases(device_t dev, unsigned nodeid, unsigned link)</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdk8_link_read_bases(struct device *dev, unsigned nodeid, unsigned link)</span><br><span> {</span><br><span>    struct resource *resource;</span><br><span> </span><br><span>@@ -363,9 +363,9 @@</span><br><span>         }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdk8_create_vga_resource(device_t dev, unsigned nodeid);</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdk8_create_vga_resource(struct device *dev, unsigned nodeid);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdk8_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdk8_read_resources(struct device *dev)</span><br><span> {</span><br><span>    unsigned nodeid;</span><br><span>     struct bus *link;</span><br><span>@@ -378,7 +378,7 @@</span><br><span>      amdk8_create_vga_resource(dev, nodeid);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdk8_set_resource(device_t dev, struct resource *resource, unsigned nodeid)</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdk8_set_resource(struct device *dev, struct resource *resource, unsigned nodeid)</span><br><span> {</span><br><span>        struct bus *link;</span><br><span>    resource_t rbase, rend;</span><br><span>@@ -475,7 +475,7 @@</span><br><span>        report_resource_stored(dev, resource, buf);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdk8_create_vga_resource(device_t dev, unsigned nodeid)</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdk8_create_vga_resource(struct device *dev, unsigned nodeid)</span><br><span> {</span><br><span>    struct resource *resource;</span><br><span>   struct bus *link;</span><br><span>@@ -485,7 +485,7 @@</span><br><span>      for (link = dev->link_list; link; link = link->next) {</span><br><span>                 if (link->bridge_ctrl & PCI_BRIDGE_CTL_VGA) {</span><br><span> #if IS_ENABLED(CONFIG_MULTIPLE_VGA_ADAPTERS)</span><br><span style="color: hsl(0, 100%, 40%);">-                    extern device_t vga_pri; // the primary vga device, defined in device.c</span><br><span style="color: hsl(120, 100%, 40%);">+                       extern struct device *vga_pri; // the primary vga device, defined in device.c</span><br><span>                        printk(BIOS_DEBUG, "VGA: vga_pri bus num = %d link bus range [%d,%d]\n", vga_pri->bus->secondary,</span><br><span>                            link->secondary,link->subordinate);</span><br><span>                    /* We need to make sure the vga_pri is under the link */</span><br><span>@@ -516,7 +516,7 @@</span><br><span>                         IORESOURCE_ASSIGNED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdk8_set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdk8_set_resources(struct device *dev)</span><br><span> {</span><br><span>       unsigned nodeid;</span><br><span>     struct bus *bus;</span><br><span>@@ -597,7 +597,7 @@</span><br><span>       .init = amdk8_nb_init,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdk8_domain_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdk8_domain_read_resources(struct device *dev)</span><br><span> {</span><br><span>      unsigned reg;</span><br><span> </span><br><span>@@ -610,7 +610,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>                      nodeid = limit & 7;</span><br><span>                      reg_link = (limit >> 4) & 3;</span><br><span>                       reg_dev = __f0_dev[nodeid];</span><br><span>@@ -717,7 +717,7 @@</span><br><span> static void disable_hoist_memory(unsigned long hole_startk, int node_id)</span><br><span> {</span><br><span>   int 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>  u32 base, limit;</span><br><span>     u32 hoist;</span><br><span>   u32 hole_sizek;</span><br><span>@@ -762,7 +762,7 @@</span><br><span> {</span><br><span>   int i;</span><br><span>       u32 carry_over;</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 base, limit;</span><br><span>     u32 basek;</span><br><span>   u32 hoist;</span><br><span>@@ -857,7 +857,7 @@</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdk8_domain_set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdk8_domain_set_resources(struct device *dev)</span><br><span> {</span><br><span>     unsigned long mmio_basek;</span><br><span>    u32 pci_tolm;</span><br><span>@@ -1009,7 +1009,7 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void amdk8_domain_scan_bus(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void amdk8_domain_scan_bus(struct device *dev)</span><br><span> {</span><br><span>        u32 reg;</span><br><span>     int i;</span><br><span>@@ -1029,7 +1029,7 @@</span><br><span>        */</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 f0_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+              struct device *f0_dev;</span><br><span>               f0_dev = __f0_dev[i];</span><br><span>                if (f0_dev && f0_dev->enabled) {</span><br><span>                  u32 httc;</span><br><span>@@ -1055,7 +1055,7 @@</span><br><span>    .scan_bus         = amdk8_domain_scan_bus,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void add_more_links(device_t dev, unsigned total_links)</span><br><span style="color: hsl(120, 100%, 40%);">+static void add_more_links(struct device *dev, unsigned total_links)</span><br><span> {</span><br><span>        struct bus *link, *last = NULL;</span><br><span>      int link_num = -1;</span><br><span>@@ -1095,7 +1095,7 @@</span><br><span> static void remap_bsp_lapic(struct bus *cpu_bus)</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>  u32 bsp_lapic_id = lapicid();</span><br><span> </span><br><span>    if (bsp_lapic_id) {</span><br><span>@@ -1107,10 +1107,10 @@</span><br><span>        }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void cpu_bus_scan(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void cpu_bus_scan(struct device *dev)</span><br><span> {</span><br><span>  struct bus *cpu_bus;</span><br><span style="color: hsl(0, 100%, 40%);">-    device_t dev_mc;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *dev_mc;</span><br><span>       int bsp_apicid;</span><br><span>      int i,j;</span><br><span>     unsigned nb_cfg_54;</span><br><span>@@ -1165,7 +1165,7 @@</span><br><span>  remap_bsp_lapic(cpu_bus);</span><br><span> </span><br><span>        for (i = 0; i < sysconf.nodes; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-                device_t cpu_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+             struct device *cpu_dev;</span><br><span> </span><br><span>          /* Find the cpu's pci device */</span><br><span>          cpu_dev = dev_find_slot(0, PCI_DEVFN(0x18 + i, 3));</span><br><span>@@ -1174,7 +1174,7 @@</span><br><span>                   * ensure all of the cpu's pci devices are found.</span><br><span>                         */</span><br><span>                  int local_j;</span><br><span style="color: hsl(0, 100%, 40%);">-                    device_t dev_f0;</span><br><span style="color: hsl(120, 100%, 40%);">+                      struct device *dev_f0;</span><br><span>                       for (local_j = 0; local_j <= 3; local_j++) {</span><br><span>                              cpu_dev = pci_probe_dev(NULL, dev_mc->bus,</span><br><span>                                        PCI_DEVFN(0x18 + i, local_j));</span><br><span>@@ -1241,14 +1241,14 @@</span><br><span>                             }</span><br><span>                    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                   device_t cpu = add_cpu_device(cpu_bus, apic_id, enable_node);</span><br><span style="color: hsl(120, 100%, 40%);">+                 struct device *cpu = add_cpu_device(cpu_bus, apic_id, enable_node);</span><br><span>                  if (cpu)</span><br><span>                             amd_cpu_topology(cpu, i, j);</span><br><span>                 } //j</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> #if IS_ENABLED(CONFIG_WAIT_BEFORE_CPUS_INIT)</span><br><span>  cpus_ready_for_init();</span><br><span>diff --git a/src/northbridge/amd/amdk8/northbridge.h b/src/northbridge/amd/amdk8/northbridge.h</span><br><span>index b39a594..99bfe4f 100644</span><br><span>--- a/src/northbridge/amd/amdk8/northbridge.h</span><br><span>+++ b/src/northbridge/amd/amdk8/northbridge.h</span><br><span>@@ -1,6 +1,6 @@</span><br><span> #ifndef NORTHBRIDGE_AMD_AMDK8_H</span><br><span> #define NORTHBRIDGE_AMD_AMDK8_H</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern unsigned int amdk8_scan_root_bus(device_t root, unsigned int max);</span><br><span style="color: hsl(120, 100%, 40%);">+extern unsigned int amdk8_scan_root_bus(struct device *root, unsigned int max);</span><br><span> </span><br><span> #endif /* NORTHBRIDGE_AMD_AMDK8_H */</span><br><span>diff --git a/src/northbridge/amd/amdk8/raminit_test.c b/src/northbridge/amd/amdk8/raminit_test.c</span><br><span>index a17f197..215a537 100644</span><br><span>--- a/src/northbridge/amd/amdk8/raminit_test.c</span><br><span>+++ b/src/northbridge/amd/amdk8/raminit_test.c</span><br><span>@@ -33,21 +33,21 @@</span><br><span> </span><br><span> unsigned char pci_register[256*5*3*256];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint8_t pci_read_config8(device_t dev, unsigned where)</span><br><span style="color: hsl(120, 100%, 40%);">+static uint8_t pci_read_config8(struct device *dev, unsigned where)</span><br><span> {</span><br><span>      unsigned addr;</span><br><span>       addr = dev | where;</span><br><span>  return pci_register[addr];</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint16_t pci_read_config16(device_t dev, unsigned where)</span><br><span style="color: hsl(120, 100%, 40%);">+static uint16_t pci_read_config16(struct device *dev, unsigned where)</span><br><span> {</span><br><span>       unsigned addr;</span><br><span>       addr = dev | where;</span><br><span>  return pci_register[addr] | (pci_register[addr + 1]  << 8);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint32_t pci_read_config32(device_t dev, unsigned where)</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t pci_read_config32(struct device *dev, unsigned where)</span><br><span> {</span><br><span>        unsigned addr;</span><br><span>       uint32_t value;</span><br><span>@@ -60,14 +60,14 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void pci_write_config8(device_t dev, unsigned where, uint8_t value)</span><br><span style="color: hsl(120, 100%, 40%);">+static void pci_write_config8(struct device *dev, unsigned where, uint8_t value)</span><br><span> {</span><br><span>  unsigned addr;</span><br><span>       addr = dev | where;</span><br><span>  pci_register[addr] = value;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void pci_write_config16(device_t dev, unsigned where, uint16_t value)</span><br><span style="color: hsl(120, 100%, 40%);">+static void pci_write_config16(struct device *dev, unsigned where, uint16_t value)</span><br><span> {</span><br><span>    unsigned addr;</span><br><span>       addr = dev | where;</span><br><span>@@ -75,7 +75,7 @@</span><br><span>      pci_register[addr + 1] = (value >> 8) & 0xff;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void pci_write_config32(device_t dev, unsigned where, uint32_t value)</span><br><span style="color: hsl(120, 100%, 40%);">+static void pci_write_config32(struct device *dev, unsigned where, uint32_t value)</span><br><span> {</span><br><span>        unsigned addr;</span><br><span>       addr = dev | where;</span><br><span>@@ -86,7 +86,7 @@</span><br><span> }</span><br><span> </span><br><span> #define PCI_DEV_INVALID (0xffffffffU)</span><br><span style="color: hsl(0, 100%, 40%);">-static device_t pci_locate_device(unsigned pci_id, device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *pci_locate_device(unsigned pci_id, struct device *dev)</span><br><span> {</span><br><span>         for (; dev <= PCI_DEV(255, 31, 7); dev += PCI_DEV(0,0,1)) {</span><br><span>               unsigned int id;</span><br><span>diff --git a/src/northbridge/amd/amdk8/util.c b/src/northbridge/amd/amdk8/util.c</span><br><span>index b701c7f..aea0469 100644</span><br><span>--- a/src/northbridge/amd/amdk8/util.c</span><br><span>+++ b/src/northbridge/amd/amdk8/util.c</span><br><span>@@ -189,7 +189,7 @@</span><br><span>  * @param dev A 32-bit number in the standard bus/dev/fn format which is used</span><br><span>  *            raw config space.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void showalldram(int level, device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void showalldram(int level, struct device *dev)</span><br><span> {</span><br><span>  u8 reg;</span><br><span>      for (reg = DRAM_ROUTE_START; reg <= DRAM_ROUTE_END; reg += 8) {</span><br><span>@@ -207,7 +207,7 @@</span><br><span>  * @param dev A 32-bit number in the standard bus/dev/fn format which is used</span><br><span>  *            raw config space.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void showallmmio(int level, device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void showallmmio(int level, struct device *dev)</span><br><span> {</span><br><span>     u8 reg;</span><br><span>      for (reg = MMIO_ROUTE_START; reg <= MMIO_ROUTE_END; reg += 8) {</span><br><span>@@ -225,7 +225,7 @@</span><br><span>  * @param dev A 32-bit number in the standard bus/dev/fn format which is used</span><br><span>  *            raw config space.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void showallpciio(int level, device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void showallpciio(int level, struct device *dev)</span><br><span> {</span><br><span>   u8 reg;</span><br><span>      for (reg = PCIIO_ROUTE_START; reg <= PCIIO_ROUTE_END; reg += 8) {</span><br><span>@@ -243,7 +243,7 @@</span><br><span>  * @param dev A 32-bit number in the standard bus/dev/fn format which is used</span><br><span>  *            raw config space.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void showallconfig(int level, device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void showallconfig(int level, struct device *dev)</span><br><span> {</span><br><span>       u8 reg;</span><br><span>      for (reg = CONFIG_ROUTE_START; reg <= CONFIG_ROUTE_END; reg += 4) {</span><br><span>@@ -260,7 +260,7 @@</span><br><span>  * @param dev A 32-bit number in the standard bus/dev/fn format which is used</span><br><span>  *            raw config space.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-void showallroutes(int level, device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void showallroutes(int level, struct device *dev)</span><br><span> {</span><br><span>   showalldram(level, dev);</span><br><span>     showallmmio(level, dev);</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26427">change 26427</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/26427"/><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: If540a8b0afb93c1ba8e901c4771228a43c1e6a14 </div>
<div style="display:none"> Gerrit-Change-Number: 26427 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>