<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26097">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/siemens: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: If67ea25a9e1363dde8aefe62b92ee7a61f0458b0<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/mainboard/siemens/mc_apl1/mainboard.c<br>M src/mainboard/siemens/mc_bdx1/mainboard.c<br>M src/mainboard/siemens/mc_tcu3/mainboard.c<br>M src/mainboard/siemens/sitemp_g1p1/acpi_tables.c<br>M src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c<br>M src/mainboard/siemens/sitemp_g1p1/mainboard.c<br>M src/mainboard/siemens/sitemp_g1p1/mainboard.h<br>M src/mainboard/siemens/sitemp_g1p1/mptable.c<br>8 files changed, 20 insertions(+), 20 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/26097/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/siemens/mc_apl1/mainboard.c b/src/mainboard/siemens/mc_apl1/mainboard.c</span><br><span>index 09667cc..b81da5f 100644</span><br><span>--- a/src/mainboard/siemens/mc_apl1/mainboard.c</span><br><span>+++ b/src/mainboard/siemens/mc_apl1/mainboard.c</span><br><span>@@ -196,7 +196,7 @@</span><br><span> static void mainboard_final(void *chip_info)</span><br><span> {</span><br><span>     uint16_t cmd = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-       device_t dev = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct device *dev = NULL;</span><br><span> </span><br><span>       /* Do board specific things */</span><br><span>       variant_mainboard_final();</span><br><span>diff --git a/src/mainboard/siemens/mc_bdx1/mainboard.c b/src/mainboard/siemens/mc_bdx1/mainboard.c</span><br><span>index 66edcb7..73290d5 100644</span><br><span>--- a/src/mainboard/siemens/mc_bdx1/mainboard.c</span><br><span>+++ b/src/mainboard/siemens/mc_bdx1/mainboard.c</span><br><span>@@ -96,7 +96,7 @@</span><br><span>  * mainboard_enable is executed as first thing after enumerate_buses().</span><br><span>  * This is the earliest point to add customization.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_enable(struct device *dev)</span><br><span> {</span><br><span> </span><br><span> }</span><br><span>@@ -104,7 +104,7 @@</span><br><span> static void mainboard_init(void *chip_info)</span><br><span> {</span><br><span>         uint8_t actl = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-       device_t dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC));</span><br><span style="color: hsl(120, 100%, 40%);">+        struct device *dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC));</span><br><span> </span><br><span>     /* Route SCI to IRQ 10 to free IRQ 9 slot. */</span><br><span>        actl = pci_read_config8(dev, ACPI_CNTL_OFFSET);</span><br><span>@@ -121,7 +121,7 @@</span><br><span> {</span><br><span>   void *spi_base = NULL;</span><br><span>       uint32_t rcba = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-      device_t dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC));</span><br><span style="color: hsl(120, 100%, 40%);">+        struct device *dev = dev_find_slot(0, PCI_DEVFN(LPC_DEV, LPC_FUNC));</span><br><span> </span><br><span>     /* Get address of SPI controller. */</span><br><span>         rcba = (pci_read_config32(dev, 0xf0) & 0xffffc000);</span><br><span>diff --git a/src/mainboard/siemens/mc_tcu3/mainboard.c b/src/mainboard/siemens/mc_tcu3/mainboard.c</span><br><span>index df08471..1f67319 100644</span><br><span>--- a/src/mainboard/siemens/mc_tcu3/mainboard.c</span><br><span>+++ b/src/mainboard/siemens/mc_tcu3/mainboard.c</span><br><span>@@ -75,7 +75,7 @@</span><br><span>  * mainboard_enable is executed as first thing after enumerate_buses().</span><br><span>  * This is the earliest point to add customization.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_enable(struct device *dev)</span><br><span> {</span><br><span>       setup_lcd_panel();</span><br><span> }</span><br><span>diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c</span><br><span>index 0787d7a..0ced54b 100644</span><br><span>--- a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c</span><br><span>+++ b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c</span><br><span>@@ -44,7 +44,7 @@</span><br><span> </span><br><span> static void acpi_write_gvars(global_vars_t *gvars)</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 resource *res;</span><br><span> </span><br><span>    memset((void *)gvars, 0, GLOBAL_VARS_SIZE);</span><br><span>@@ -86,7 +86,7 @@</span><br><span>      return current;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void mainboard_inject_dsdt(device_t device)</span><br><span style="color: hsl(120, 100%, 40%);">+void mainboard_inject_dsdt(struct device *device)</span><br><span> {</span><br><span>  global_vars_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, GLOBAL_VARS_SIZE);</span><br><span> </span><br><span>diff --git a/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c b/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c</span><br><span>index dc6833a..b1b7270 100644</span><br><span>--- a/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c</span><br><span>+++ b/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c</span><br><span>@@ -57,7 +57,7 @@</span><br><span> void get_bus_conf(void)</span><br><span> {</span><br><span>         u32 apicid_base;</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;</span><br><span> </span><br><span>   if (get_bus_conf_done == 1)</span><br><span>diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c</span><br><span>index bc2c75b..3da34003 100644</span><br><span>--- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c</span><br><span>+++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c</span><br><span>@@ -378,7 +378,7 @@</span><br><span> {</span><br><span>     u16 word;</span><br><span>    u8 byte;</span><br><span style="color: hsl(0, 100%, 40%);">-        device_t sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));</span><br><span style="color: hsl(120, 100%, 40%);">+       struct device *sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));</span><br><span> </span><br><span>    /* set SB600 GPIO 64 to GPIO with pull-up */</span><br><span>         byte = pm2_ioread(0x42);</span><br><span>@@ -420,7 +420,7 @@</span><br><span> {</span><br><span>  u8 byte, byte2;</span><br><span>      u8 cpu_pwm_conf, case_pwm_conf;</span><br><span style="color: hsl(0, 100%, 40%);">- device_t sm_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *sm_dev;</span><br><span>       struct fan_control cpu_fan_control, case_fan_control;</span><br><span>        const char *name = NULL;</span><br><span> </span><br><span>@@ -596,8 +596,8 @@</span><br><span>   resource_t rbase, rend;</span><br><span>      u32 base, limit;</span><br><span>     struct resource *resource;</span><br><span style="color: hsl(0, 100%, 40%);">-      device_t dev;</span><br><span style="color: hsl(0, 100%, 40%);">-   device_t k8_f1 = dev_find_slot(0, PCI_DEVFN(0x18,1));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *dev;</span><br><span style="color: hsl(120, 100%, 40%);">+   struct device *k8_f1 = dev_find_slot(0, PCI_DEVFN(0x18,1));</span><br><span> </span><br><span>      printk(BIOS_DEBUG,"%s ...\n", __func__);</span><br><span> </span><br><span>@@ -644,7 +644,7 @@</span><br><span> </span><br><span> unsigned int plx_present = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void update_subsystemid( device_t dev )</span><br><span style="color: hsl(120, 100%, 40%);">+static void update_subsystemid( struct device *dev )</span><br><span> {</span><br><span>       int i;</span><br><span> </span><br><span>@@ -656,7 +656,7 @@</span><br><span>     }</span><br><span>    printk(BIOS_INFO, "%s [%x/%x]\n", dev_name(dev), dev->subsystem_vendor, dev->subsystem_device );</span><br><span>     for( i = 0; slot[i].bus < 255; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-                device_t d;</span><br><span style="color: hsl(120, 100%, 40%);">+           struct device *d;</span><br><span>            d = dev_find_slot(slot[i].bus,slot[i].devfn);</span><br><span>                if( d ) {</span><br><span>                    printk(BIOS_DEBUG,"%s subsystem <- %x/%x\n", dev_path(d), dev->subsystem_vendor, dev->subsystem_device);</span><br><span>@@ -665,10 +665,10 @@</span><br><span>  }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void detect_hw_variant( device_t dev )</span><br><span style="color: hsl(120, 100%, 40%);">+static void detect_hw_variant( struct device *dev )</span><br><span> {</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   device_t nb_dev =0, dev2 = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *nb_dev =0, dev2 = 0;</span><br><span>  struct southbridge_amd_rs690_config *cfg;</span><br><span>    u32 lc_state, id = 0;</span><br><span> </span><br><span>@@ -777,7 +777,7 @@</span><br><span>  * @param dev - the root device</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_init(struct device *dev)</span><br><span> {</span><br><span> #if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_REALMODE)</span><br><span>     INT15_function_extensions int15_func;</span><br><span>@@ -803,7 +803,7 @@</span><br><span> * enable the dedicated function in sina board.</span><br><span> * This function called early than rs690_enable.</span><br><span> *************************************************/</span><br><span style="color: hsl(0, 100%, 40%);">-static void mainboard_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mainboard_enable(struct device *dev)</span><br><span> {</span><br><span> </span><br><span>  printk(BIOS_INFO, "%s %s[%x/%x] %s\n",</span><br><span>diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.h b/src/mainboard/siemens/sitemp_g1p1/mainboard.h</span><br><span>index 33d0a5e..7e15992 100644</span><br><span>--- a/src/mainboard/siemens/sitemp_g1p1/mainboard.h</span><br><span>+++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.h</span><br><span>@@ -1 +1 @@</span><br><span style="color: hsl(0, 100%, 40%);">-void mainboard_inject_dsdt(device_t device);</span><br><span style="color: hsl(120, 100%, 40%);">+void mainboard_inject_dsdt(struct device *device);</span><br><span>diff --git a/src/mainboard/siemens/sitemp_g1p1/mptable.c b/src/mainboard/siemens/sitemp_g1p1/mptable.c</span><br><span>index 832a79e..3515d30 100644</span><br><span>--- a/src/mainboard/siemens/sitemp_g1p1/mptable.c</span><br><span>+++ b/src/mainboard/siemens/sitemp_g1p1/mptable.c</span><br><span>@@ -45,7 +45,7 @@</span><br><span>         mptable_write_buses(mc, NULL, &isa_bus);</span><br><span>         /* I/O APICs:   APIC ID Version State   Address */</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> </span><br><span>              dev = dev_find_slot(bus_sb600[0], PCI_DEVFN(sbdn_sb600 + 0x14, 0));</span><br><span>          if (dev) {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26097">change 26097</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/26097"/><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: If67ea25a9e1363dde8aefe62b92ee7a61f0458b0 </div>
<div style="display:none"> Gerrit-Change-Number: 26097 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>