<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26395">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sb/via/vt8237r: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: Ic4137bc4008d08e0e0d002e52c353fc29355ccb1<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/southbridge/via/vt8237r/ctrl.c<br>M src/southbridge/via/vt8237r/fadt.c<br>M src/southbridge/via/vt8237r/ide.c<br>M src/southbridge/via/vt8237r/lpc.c<br>M src/southbridge/via/vt8237r/pirq.c<br>M src/southbridge/via/vt8237r/sata.c<br>M src/southbridge/via/vt8237r/usb.c<br>M src/southbridge/via/vt8237r/vt8237r.c<br>M src/southbridge/via/vt8237r/vt8237r.h<br>9 files changed, 17 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/95/26395/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/southbridge/via/vt8237r/ctrl.c b/src/southbridge/via/vt8237r/ctrl.c</span><br><span>index 7b1518c..cc42d41 100644</span><br><span>--- a/src/southbridge/via/vt8237r/ctrl.c</span><br><span>+++ b/src/southbridge/via/vt8237r/ctrl.c</span><br><span>@@ -26,7 +26,7 @@</span><br><span> static void vt8237_cfg(struct device *dev)</span><br><span> {</span><br><span>       u8 regm;</span><br><span style="color: hsl(0, 100%, 40%);">-        device_t devfun3;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct device *devfun3;</span><br><span> </span><br><span>  devfun3 = dev_find_device(PCI_VENDOR_ID_VIA,</span><br><span>                                   PCI_DEVICE_ID_VIA_K8T800_DRAM, 0);</span><br><span>@@ -107,7 +107,7 @@</span><br><span> static void vt8237s_vlink_init(struct device *dev)</span><br><span> {</span><br><span>        u8 reg;</span><br><span style="color: hsl(0, 100%, 40%);">- device_t devfun7;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct device *devfun7;</span><br><span> </span><br><span>  devfun7 = dev_find_device(PCI_VENDOR_ID_VIA,</span><br><span>                                   PCI_DEVICE_ID_VIA_K8T800_NB_SB_CTR, 0);</span><br><span>@@ -182,7 +182,7 @@</span><br><span> static void vt8237a_vlink_init(struct device *dev)</span><br><span> {</span><br><span>   u8 reg;</span><br><span style="color: hsl(0, 100%, 40%);">- device_t devfun7;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct device *devfun7;</span><br><span> </span><br><span>  devfun7 = dev_find_device(PCI_VENDOR_ID_VIA,</span><br><span>                                   PCI_DEVICE_ID_VIA_K8T800_NB_SB_CTR, 0);</span><br><span>@@ -276,7 +276,7 @@</span><br><span>       * VT8237R specific configuration. Other SB are done in their own</span><br><span>     * directories. TODO: Add A version.</span><br><span>          */</span><br><span style="color: hsl(0, 100%, 40%);">-     device_t devsb = dev_find_device(PCI_VENDOR_ID_VIA,</span><br><span style="color: hsl(120, 100%, 40%);">+   struct device *devsb = dev_find_device(PCI_VENDOR_ID_VIA,</span><br><span>                                     PCI_DEVICE_ID_VIA_VT8237S_LPC, 0);</span><br><span>  if (devsb) {</span><br><span>                 vt8237s_vlink_init(dev);</span><br><span>diff --git a/src/southbridge/via/vt8237r/fadt.c b/src/southbridge/via/vt8237r/fadt.c</span><br><span>index afebd7d..c5cd1d6 100644</span><br><span>--- a/src/southbridge/via/vt8237r/fadt.c</span><br><span>+++ b/src/southbridge/via/vt8237r/fadt.c</span><br><span>@@ -28,7 +28,7 @@</span><br><span> void acpi_create_fadt(acpi_fadt_t *fadt, acpi_facs_t *facs, void *dsdt)</span><br><span> {</span><br><span>    acpi_header_t *header = &(fadt->header);</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 is_vt8237s = 0;</span><br><span> </span><br><span>      /* Power management controller */</span><br><span>diff --git a/src/southbridge/via/vt8237r/ide.c b/src/southbridge/via/vt8237r/ide.c</span><br><span>index e500c2c..ac9a5e7 100644</span><br><span>--- a/src/southbridge/via/vt8237r/ide.c</span><br><span>+++ b/src/southbridge/via/vt8237r/ide.c</span><br><span>@@ -103,7 +103,7 @@</span><br><span>     pci_write_config32(dev, IDE_UDMA, cablesel);</span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_EPIA_VT8237R_INIT)</span><br><span style="color: hsl(0, 100%, 40%);">-    device_t lpc_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct device *lpc_dev;</span><br><span> </span><br><span>  /* Set PATA Output Drive Strength */</span><br><span>         lpc_dev = dev_find_device(PCI_VENDOR_ID_VIA,</span><br><span>diff --git a/src/southbridge/via/vt8237r/lpc.c b/src/southbridge/via/vt8237r/lpc.c</span><br><span>index 70ac5d9..f819493 100644</span><br><span>--- a/src/southbridge/via/vt8237r/lpc.c</span><br><span>+++ b/src/southbridge/via/vt8237r/lpc.c</span><br><span>@@ -62,7 +62,7 @@</span><br><span> static void pci_routing_fixup(struct device *dev)</span><br><span> {</span><br><span> #if IS_ENABLED(CONFIG_EPIA_VT8237R_INIT)</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> #endif</span><br><span> </span><br><span>   /* PCI PNP Interrupt Routing INTE/F - disable */</span><br><span>@@ -144,7 +144,7 @@</span><br><span>  * This avoids having to handle any System Management Interrupts (SMIs).</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void setup_pm(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void setup_pm(struct device *dev)</span><br><span> {</span><br><span>       u16 tmp;</span><br><span>     struct southbridge_via_vt8237r_config *cfg;</span><br><span>@@ -567,7 +567,7 @@</span><br><span>    cmos_init(0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void vt8237r_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void vt8237r_read_resources(struct device *dev)</span><br><span> {</span><br><span>  struct resource *res;</span><br><span> </span><br><span>@@ -639,7 +639,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void vt8237_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void vt8237_set_subsystem(struct device *dev, unsigned vendor, unsigned device)</span><br><span> {</span><br><span>    pci_write_config16(dev, 0x70, vendor);</span><br><span>       pci_write_config16(dev, 0x72, device);</span><br><span>diff --git a/src/southbridge/via/vt8237r/pirq.c b/src/southbridge/via/vt8237r/pirq.c</span><br><span>index fd55b1f..e7eacdc 100644</span><br><span>--- a/src/southbridge/via/vt8237r/pirq.c</span><br><span>+++ b/src/southbridge/via/vt8237r/pirq.c</span><br><span>@@ -24,7 +24,7 @@</span><br><span> #if IS_ENABLED(CONFIG_PIRQ_ROUTE) && IS_ENABLED(CONFIG_GENERATE_PIRQ_TABLE)</span><br><span> void pirq_assign_irqs(const unsigned char route[4])</span><br><span> {</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> </span><br><span>     pdev = dev_find_device(PCI_VENDOR_ID_VIA,</span><br><span>                            PCI_DEVICE_ID_VIA_VT8237R_LPC, 0);</span><br><span>diff --git a/src/southbridge/via/vt8237r/sata.c b/src/southbridge/via/vt8237r/sata.c</span><br><span>index 42e3e85..d0188d5 100644</span><br><span>--- a/src/southbridge/via/vt8237r/sata.c</span><br><span>+++ b/src/southbridge/via/vt8237r/sata.c</span><br><span>@@ -92,7 +92,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void vt8237_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void vt8237_set_subsystem(struct device *dev, unsigned vendor, unsigned device)</span><br><span> {</span><br><span>        pci_write_config16(dev, 0xd4, vendor);</span><br><span>       pci_write_config16(dev, 0xd6, device);</span><br><span>diff --git a/src/southbridge/via/vt8237r/usb.c b/src/southbridge/via/vt8237r/usb.c</span><br><span>index 057a07d..070cd62 100644</span><br><span>--- a/src/southbridge/via/vt8237r/usb.c</span><br><span>+++ b/src/southbridge/via/vt8237r/usb.c</span><br><span>@@ -154,7 +154,7 @@</span><br><span>        return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void vt8237_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void vt8237_set_subsystem(struct device *dev, unsigned vendor, unsigned device)</span><br><span> {</span><br><span>        pci_write_config32(dev, 0x42, pci_read_config32(dev, 0x42) | 0x10);</span><br><span>  pci_write_config16(dev, 0x2c, vendor);</span><br><span>diff --git a/src/southbridge/via/vt8237r/vt8237r.c b/src/southbridge/via/vt8237r/vt8237r.c</span><br><span>index e1a0e35..b88affe 100644</span><br><span>--- a/src/southbridge/via/vt8237r/vt8237r.c</span><br><span>+++ b/src/southbridge/via/vt8237r/vt8237r.c</span><br><span>@@ -44,7 +44,7 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void dump_south(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void dump_south(struct device *dev)</span><br><span> {</span><br><span>        int i, j;</span><br><span> </span><br><span>diff --git a/src/southbridge/via/vt8237r/vt8237r.h b/src/southbridge/via/vt8237r/vt8237r.h</span><br><span>index d4cc771..f383736 100644</span><br><span>--- a/src/southbridge/via/vt8237r/vt8237r.h</span><br><span>+++ b/src/southbridge/via/vt8237r/vt8237r.h</span><br><span>@@ -144,9 +144,9 @@</span><br><span> void vt8237_early_spi_init(void);</span><br><span> int vt8237_early_network_init(struct vt8237_network_rom *rom);</span><br><span> #else</span><br><span style="color: hsl(0, 100%, 40%);">-void writeback(device_t dev, u16 where, u8 what);</span><br><span style="color: hsl(0, 100%, 40%);">-void dump_south(device_t dev);</span><br><span style="color: hsl(0, 100%, 40%);">-u32 vt8237_ide_80pin_detect(device_t dev);</span><br><span style="color: hsl(120, 100%, 40%);">+void writeback(struct device *dev, u16 where, u8 what);</span><br><span style="color: hsl(120, 100%, 40%);">+void dump_south(struct device *dev);</span><br><span style="color: hsl(120, 100%, 40%);">+u32 vt8237_ide_80pin_detect(struct device *dev);</span><br><span> #endif</span><br><span> </span><br><span> #endif</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26395">change 26395</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/26395"/><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: Ic4137bc4008d08e0e0d002e52c353fc29355ccb1 </div>
<div style="display:none"> Gerrit-Change-Number: 26395 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>