<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26398">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sb/sis/sis966: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: I6002949fa90a46a2dd0e3519acbf2606bb679322<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/southbridge/sis/sis966/aza.c<br>M src/southbridge/sis/sis966/early_setup_car.c<br>M src/southbridge/sis/sis966/ide.c<br>M src/southbridge/sis/sis966/lpc.c<br>M src/southbridge/sis/sis966/nic.c<br>M src/southbridge/sis/sis966/sata.c<br>M src/southbridge/sis/sis966/sis761.c<br>M src/southbridge/sis/sis966/sis966.c<br>M src/southbridge/sis/sis966/sis966.h<br>M src/southbridge/sis/sis966/usb.c<br>M src/southbridge/sis/sis966/usb2.c<br>11 files changed, 24 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/26398/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/southbridge/sis/sis966/aza.c b/src/southbridge/sis/sis966/aza.c</span><br><span>index f1a46b5..bbde00a 100644</span><br><span>--- a/src/southbridge/sis/sis966/aza.c</span><br><span>+++ b/src/southbridge/sis/sis966/aza.c</span><br><span>@@ -295,7 +295,7 @@</span><br><span>      printk(BIOS_DEBUG, "AZALIA_INIT:<----------\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned vendor, unsigned device)</span><br><span> {</span><br><span>      pci_write_config32(dev, 0x40,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/sis/sis966/early_setup_car.c b/src/southbridge/sis/sis966/early_setup_car.c</span><br><span>index ba6d8a3..e79d40c 100644</span><br><span>--- a/src/southbridge/sis/sis966/early_setup_car.c</span><br><span>+++ b/src/southbridge/sis/sis966/early_setup_car.c</span><br><span>@@ -23,7 +23,7 @@</span><br><span>       uint32_t pll_ctrl;</span><br><span>   uint32_t dword;</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>  dev = PCI_DEV(busnx, devnx+1, 1);</span><br><span>    dword = pci_read_config32(dev, 0xe4);</span><br><span>        dword |= 0x3f0; // disable it at first</span><br><span>diff --git a/src/southbridge/sis/sis966/ide.c b/src/southbridge/sis/sis966/ide.c</span><br><span>index 6c7c7fe..13bf1d1 100644</span><br><span>--- a/src/southbridge/sis/sis966/ide.c</span><br><span>+++ b/src/southbridge/sis/sis966/ide.c</span><br><span>@@ -158,7 +158,7 @@</span><br><span> printk(BIOS_DEBUG, "IDE_INIT:<----------\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned vendor, unsigned device)</span><br><span> {</span><br><span>    pci_write_config32(dev, 0x40,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/sis/sis966/lpc.c b/src/southbridge/sis/sis966/lpc.c</span><br><span>index 82b850b..2140d01 100644</span><br><span>--- a/src/southbridge/sis/sis966/lpc.c</span><br><span>+++ b/src/southbridge/sis/sis966/lpc.c</span><br><span>@@ -52,7 +52,7 @@</span><br><span> </span><br><span> #undef SLAVE_INIT</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpc_common_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpc_common_init(struct device *dev)</span><br><span> {</span><br><span>   uint8_t byte;</span><br><span>        void *ioapic_base;</span><br><span>@@ -67,13 +67,13 @@</span><br><span> }</span><br><span> </span><br><span> #ifdef SLAVE_INIT</span><br><span style="color: hsl(0, 100%, 40%);">-static void lpc_slave_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpc_slave_init(struct device *dev)</span><br><span> {</span><br><span>  lpc_common_init(dev);</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpc_usb_legacy_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpc_usb_legacy_init(struct device *dev)</span><br><span> {</span><br><span>      uint16_t acpi_base;</span><br><span> </span><br><span>@@ -83,7 +83,7 @@</span><br><span>  outb(inb(acpi_base + 0xba) |0x80, acpi_base + 0xba);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpc_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpc_init(struct device *dev)</span><br><span> {</span><br><span>       uint8_t byte;</span><br><span>        uint8_t byte_old;</span><br><span>@@ -152,7 +152,7 @@</span><br><span>      printk(BIOS_DEBUG, "LPC_INIT <--------\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void sis966_lpc_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void sis966_lpc_read_resources(struct device *dev)</span><br><span> {</span><br><span>         struct resource *res;</span><br><span> </span><br><span>@@ -183,7 +183,7 @@</span><br><span>  *</span><br><span>  * @param dev The device whose children's resources are to be enabled.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void sis966_lpc_enable_childrens_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void sis966_lpc_enable_childrens_resources(struct device *dev)</span><br><span> {</span><br><span>        struct bus *link;</span><br><span>    uint32_t reg, reg_var[4];</span><br><span>@@ -193,7 +193,7 @@</span><br><span>      reg = pci_read_config32(dev, 0xa0);</span><br><span> </span><br><span>      for (link = dev->link_list; link; link = link->next) {</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>                for (child = link->children; child; child = child->sibling) {</span><br><span>                  if (child->enabled && (child->path.type == DEVICE_PATH_PNP)) {</span><br><span>                                 struct resource *res;</span><br><span>@@ -234,13 +234,13 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void sis966_lpc_enable_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void sis966_lpc_enable_resources(struct device *dev)</span><br><span> {</span><br><span>    pci_dev_enable_resources(dev);</span><br><span>       sis966_lpc_enable_childrens_resources(dev);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned vendor, unsigned device)</span><br><span> {</span><br><span>        pci_write_config32(dev, 0x40,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/sis/sis966/nic.c b/src/southbridge/sis/sis966/nic.c</span><br><span>index fee2988..4e835dd 100644</span><br><span>--- a/src/southbridge/sis/sis966/nic.c</span><br><span>+++ b/src/southbridge/sis/sis966/nic.c</span><br><span>@@ -311,7 +311,7 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned vendor, unsigned device)</span><br><span> {</span><br><span>       pci_write_config32(dev, 0x40,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/sis/sis966/sata.c b/src/southbridge/sis/sis966/sata.c</span><br><span>index b9e8432..7dc7afb 100644</span><br><span>--- a/src/southbridge/sis/sis966/sata.c</span><br><span>+++ b/src/southbridge/sis/sis966/sata.c</span><br><span>@@ -145,7 +145,7 @@</span><br><span>         printk(BIOS_DEBUG, "SATA_INIT:<----------\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned vendor, unsigned device)</span><br><span> {</span><br><span>        pci_write_config32(dev, 0x40,</span><br><span>                           ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/sis/sis966/sis761.c b/src/southbridge/sis/sis966/sis761.c</span><br><span>index 174cda3..93f8142 100644</span><br><span>--- a/src/southbridge/sis/sis966/sis761.c</span><br><span>+++ b/src/southbridge/sis/sis966/sis761.c</span><br><span>@@ -64,7 +64,7 @@</span><br><span>  *</span><br><span>  * @param dev TODO</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void sis761_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void sis761_read_resources(struct device *dev)</span><br><span> {</span><br><span>  /* Read the generic PCI resources */</span><br><span>         printk(BIOS_DEBUG, "sis761_read_resources ------->\n");</span><br><span>@@ -81,7 +81,7 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void sis761_set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void sis761_set_resources(struct device *dev)</span><br><span> {</span><br><span>       printk(BIOS_DEBUG, "sis761_set_resources ------->\n");</span><br><span> </span><br><span>diff --git a/src/southbridge/sis/sis966/sis966.c b/src/southbridge/sis/sis966/sis966.c</span><br><span>index cba4898..d1cb4da 100644</span><br><span>--- a/src/southbridge/sis/sis966/sis966.c</span><br><span>+++ b/src/southbridge/sis/sis966/sis966.c</span><br><span>@@ -31,10 +31,10 @@</span><br><span> </span><br><span> static uint32_t final_reg;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static device_t find_lpc_dev( device_t dev,  unsigned devfn)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct device *find_lpc_dev( struct device *dev,  unsigned devfn)</span><br><span> {</span><br><span> </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>  lpc_dev = dev_find_slot(dev->bus->secondary, devfn);</span><br><span> </span><br><span>@@ -54,10 +54,10 @@</span><br><span>         return lpc_dev;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void sis966_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void sis966_enable(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   device_t lpc_dev = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-   device_t sm_dev = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct device *lpc_dev = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+   struct device *sm_dev = 0;</span><br><span>   uint16_t index = 0;</span><br><span>  uint16_t index2 = 0;</span><br><span>         uint32_t reg_old, reg;</span><br><span>diff --git a/src/southbridge/sis/sis966/sis966.h b/src/southbridge/sis/sis966/sis966.h</span><br><span>index 61bf0ee..bc59546 100644</span><br><span>--- a/src/southbridge/sis/sis966/sis966.h</span><br><span>+++ b/src/southbridge/sis/sis966/sis966.h</span><br><span>@@ -32,7 +32,7 @@</span><br><span> #define DEBUG_USB2 0</span><br><span> </span><br><span> #ifndef __SIMPLE_DEVICE__</span><br><span style="color: hsl(0, 100%, 40%);">-void sis966_enable(device_t dev);</span><br><span style="color: hsl(120, 100%, 40%);">+void sis966_enable(struct device *dev);</span><br><span> #endif</span><br><span> </span><br><span> #endif /* SIS966_H */</span><br><span>diff --git a/src/southbridge/sis/sis966/usb.c b/src/southbridge/sis/sis966/usb.c</span><br><span>index 3f4f98d..de8076d 100644</span><br><span>--- a/src/southbridge/sis/sis966/usb.c</span><br><span>+++ b/src/southbridge/sis/sis966/usb.c</span><br><span>@@ -86,7 +86,7 @@</span><br><span>       printk(BIOS_DEBUG, "USB 1.1 INIT:<----------\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned vendor, unsigned device)</span><br><span> {</span><br><span>     pci_write_config32(dev, 0x40,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/sis/sis966/usb2.c b/src/southbridge/sis/sis966/usb2.c</span><br><span>index 79e7d09..095a955 100644</span><br><span>--- a/src/southbridge/sis/sis966/usb2.c</span><br><span>+++ b/src/southbridge/sis/sis966/usb2.c</span><br><span>@@ -103,7 +103,7 @@</span><br><span>         printk(BIOS_DEBUG, "USB 2.0 INIT:<----------\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void lpci_set_subsystem(struct device *dev, unsigned vendor, unsigned device)</span><br><span> {</span><br><span>     pci_write_config32(dev, 0x40,</span><br><span>                ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26398">change 26398</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/26398"/><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: I6002949fa90a46a2dd0e3519acbf2606bb679322 </div>
<div style="display:none"> Gerrit-Change-Number: 26398 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>