<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26245">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sb/intel/i82801gx: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: Iccddf3140fd94c2e5a246fe2839573f5dd387147<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/southbridge/intel/i82801gx/ac97.c<br>M src/southbridge/intel/i82801gx/azalia.c<br>M src/southbridge/intel/i82801gx/i82801gx.c<br>M src/southbridge/intel/i82801gx/i82801gx.h<br>M src/southbridge/intel/i82801gx/ide.c<br>M src/southbridge/intel/i82801gx/lpc.c<br>M src/southbridge/intel/i82801gx/pci.c<br>M src/southbridge/intel/i82801gx/pcie.c<br>M src/southbridge/intel/i82801gx/sata.c<br>M src/southbridge/intel/i82801gx/smbus.c<br>M src/southbridge/intel/i82801gx/usb.c<br>M src/southbridge/intel/i82801gx/usb_ehci.c<br>M src/southbridge/intel/i82801gx/watchdog.c<br>13 files changed, 26 insertions(+), 26 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/26245/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/southbridge/intel/i82801gx/ac97.c b/src/southbridge/intel/i82801gx/ac97.c</span><br><span>index b86891b..a4f6528 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/ac97.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/ac97.c</span><br><span>@@ -246,7 +246,7 @@</span><br><span>     }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ac97_set_subsystem(device_t dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+static void ac97_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span>                         unsigned int device)</span><br><span> {</span><br><span>    if (!vendor || !device) {</span><br><span>diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c</span><br><span>index 01c1196..1642504 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/azalia.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/azalia.c</span><br><span>@@ -303,7 +303,7 @@</span><br><span>     }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void azalia_set_subsystem(device_t dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+static void azalia_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span>                             unsigned int device)</span><br><span> {</span><br><span>    if (!vendor || !device) {</span><br><span>diff --git a/src/southbridge/intel/i82801gx/i82801gx.c b/src/southbridge/intel/i82801gx/i82801gx.c</span><br><span>index aab674b..eb0583f 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/i82801gx.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/i82801gx.c</span><br><span>@@ -20,7 +20,7 @@</span><br><span> #include "i82801gx.h"</span><br><span> #include "sata.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void i82801gx_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void i82801gx_enable(struct device *dev)</span><br><span> {</span><br><span>        u32 reg32;</span><br><span> </span><br><span>diff --git a/src/southbridge/intel/i82801gx/i82801gx.h b/src/southbridge/intel/i82801gx/i82801gx.h</span><br><span>index df744fc..1038baf 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/i82801gx.h</span><br><span>+++ b/src/southbridge/intel/i82801gx/i82801gx.h</span><br><span>@@ -44,7 +44,7 @@</span><br><span> #if !defined(__PRE_RAM__)</span><br><span> #include "chip.h"</span><br><span> #if !defined(__SIMPLE_DEVICE__)</span><br><span style="color: hsl(0, 100%, 40%);">-void i82801gx_enable(device_t dev);</span><br><span style="color: hsl(120, 100%, 40%);">+void i82801gx_enable(struct device *dev);</span><br><span> #endif</span><br><span> void gpi_route_interrupt(u8 gpi, u8 mode);</span><br><span> #else</span><br><span>diff --git a/src/southbridge/intel/i82801gx/ide.c b/src/southbridge/intel/i82801gx/ide.c</span><br><span>index e135336..8159570 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/ide.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/ide.c</span><br><span>@@ -91,7 +91,7 @@</span><br><span>   printk(BIOS_DEBUG, "\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ide_set_subsystem(device_t dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+static void ide_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span>                         unsigned int device)</span><br><span> {</span><br><span>    if (!vendor || !device) {</span><br><span>diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c</span><br><span>index a26b9f8..462e357 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/lpc.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/lpc.c</span><br><span>@@ -88,9 +88,9 @@</span><br><span>  * 0x80 - The PIRQ is not routed.</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void i82801gx_pirq_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void i82801gx_pirq_init(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t irq_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct device *irq_dev;</span><br><span>      /* Get the chip configuration */</span><br><span>     config_t *config = dev->chip_info;</span><br><span> </span><br><span>@@ -134,7 +134,7 @@</span><br><span>      }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void i82801gx_gpi_routing(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void i82801gx_gpi_routing(struct device *dev)</span><br><span> {</span><br><span>  /* Get the chip configuration */</span><br><span>     config_t *config = dev->chip_info;</span><br><span>@@ -163,7 +163,7 @@</span><br><span>  pci_write_config32(dev, GPIO_ROUT, reg32);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void i82801gx_power_options(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void i82801gx_power_options(struct device *dev)</span><br><span> {</span><br><span>     u8 reg8;</span><br><span>     u16 reg16, pmbase;</span><br><span>@@ -267,7 +267,7 @@</span><br><span>     outl(reg32, pmbase + 0x04);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void i82801gx_configure_cstates(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void i82801gx_configure_cstates(struct device *dev)</span><br><span> {</span><br><span>    u8 reg8;</span><br><span> </span><br><span>@@ -487,7 +487,7 @@</span><br><span> </span><br><span> void acpi_fill_fadt(acpi_fadt_t *fadt)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f, 0));</span><br><span style="color: hsl(120, 100%, 40%);">+  struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1f, 0));</span><br><span>   config_t *chip = dev->chip_info;</span><br><span>  u16 pmbase = pci_read_config16(dev, 0x40) & 0xfffe;</span><br><span> </span><br><span>@@ -603,7 +603,7 @@</span><br><span>            fadt->flags |= ACPI_FADT_DOCKING_SUPPORTED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void i82801gx_lpc_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void i82801gx_lpc_read_resources(struct device *dev)</span><br><span> {</span><br><span>       struct resource *res;</span><br><span>        u8 io_index = 0;</span><br><span>@@ -645,7 +645,7 @@</span><br><span>       }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void set_subsystem(device_t dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+static void set_subsystem(struct device *dev, unsigned int vendor,</span><br><span>                   unsigned int device)</span><br><span> {</span><br><span>    if (!vendor || !device) {</span><br><span>@@ -657,7 +657,7 @@</span><br><span>      }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void southbridge_inject_dsdt(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void southbridge_inject_dsdt(struct device *dev)</span><br><span> {</span><br><span>    global_nvs_t *gnvs = cbmem_add(CBMEM_ID_ACPI_GNVS, sizeof(*gnvs));</span><br><span> </span><br><span>diff --git a/src/southbridge/intel/i82801gx/pci.c b/src/southbridge/intel/i82801gx/pci.c</span><br><span>index 1635dfe..a054dc4 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/pci.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/pci.c</span><br><span>@@ -97,7 +97,7 @@</span><br><span>      ich_pci_dev_enable_resources(dev);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void set_subsystem(device_t dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+static void set_subsystem(struct device *dev, unsigned int vendor,</span><br><span>                  unsigned int device)</span><br><span> {</span><br><span>    /* NOTE: This is not the default position! */</span><br><span>diff --git a/src/southbridge/intel/i82801gx/pcie.c b/src/southbridge/intel/i82801gx/pcie.c</span><br><span>index 0d14ff4..b7a60f2 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/pcie.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/pcie.c</span><br><span>@@ -89,7 +89,7 @@</span><br><span>   pci_write_config16(dev, 0x1e, reg16);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void pcie_set_subsystem(device_t dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+static void pcie_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span>                     unsigned int device)</span><br><span> {</span><br><span>    /* NOTE: This is not the default position! */</span><br><span>diff --git a/src/southbridge/intel/i82801gx/sata.c b/src/southbridge/intel/i82801gx/sata.c</span><br><span>index a08f266..e46ee46 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/sata.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/sata.c</span><br><span>@@ -199,7 +199,7 @@</span><br><span>         pci_write_config32(dev, SATA_IR, reg32);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void sata_set_subsystem(device_t dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+static void sata_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span>                  unsigned int device)</span><br><span> {</span><br><span>    if (!vendor || !device) {</span><br><span>diff --git a/src/southbridge/intel/i82801gx/smbus.c b/src/southbridge/intel/i82801gx/smbus.c</span><br><span>index fdf76a0..63e66d4 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/smbus.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/smbus.c</span><br><span>@@ -25,7 +25,7 @@</span><br><span> #include <southbridge/intel/common/smbus.h></span><br><span> #include "i82801gx.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int lsmbus_read_byte(device_t dev, u8 address)</span><br><span style="color: hsl(120, 100%, 40%);">+static int lsmbus_read_byte(struct device *dev, u8 address)</span><br><span> {</span><br><span>        u16 device;</span><br><span>  struct resource *res;</span><br><span>@@ -38,7 +38,7 @@</span><br><span>    return do_smbus_read_byte(res->base, device, address);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int lsmbus_write_byte(device_t dev, u8 address, u8 data)</span><br><span style="color: hsl(120, 100%, 40%);">+static int lsmbus_write_byte(struct device *dev, u8 address, u8 data)</span><br><span> {</span><br><span>        u16 device;</span><br><span>  struct resource *res;</span><br><span>@@ -50,7 +50,7 @@</span><br><span>    return do_smbus_write_byte(res->base, device, address, data);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int lsmbus_block_write(device_t dev, u8 cmd, u8 bytes, const u8 *buf)</span><br><span style="color: hsl(120, 100%, 40%);">+static int lsmbus_block_write(struct device *dev, u8 cmd, u8 bytes, const u8 *buf)</span><br><span> {</span><br><span>       u16 device;</span><br><span>  struct resource *res;</span><br><span>@@ -62,7 +62,7 @@</span><br><span>    return do_smbus_block_write(res->base, device, cmd, bytes, buf);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int lsmbus_block_read(device_t dev, u8 cmd, u8 bytes, u8 *buf)</span><br><span style="color: hsl(120, 100%, 40%);">+static int lsmbus_block_read(struct device *dev, u8 cmd, u8 bytes, u8 *buf)</span><br><span> {</span><br><span>  u16 device;</span><br><span>  struct resource *res;</span><br><span>@@ -82,7 +82,7 @@</span><br><span>    .block_write    = lsmbus_block_write,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void smbus_set_subsystem(device_t dev, unsigned int vendor, unsigned int device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void smbus_set_subsystem(struct device *dev, unsigned int vendor, unsigned int device)</span><br><span> {</span><br><span>   if (!vendor || !device) {</span><br><span>            pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,</span><br><span>@@ -97,7 +97,7 @@</span><br><span>         .set_subsystem    = smbus_set_subsystem,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void smbus_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void smbus_read_resources(struct device *dev)</span><br><span> {</span><br><span>  struct resource *res = new_resource(dev, PCI_BASE_ADDRESS_4);</span><br><span>        res->base = SMBUS_IO_BASE;</span><br><span>diff --git a/src/southbridge/intel/i82801gx/usb.c b/src/southbridge/intel/i82801gx/usb.c</span><br><span>index 2978080..092ca9f 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/usb.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/usb.c</span><br><span>@@ -42,7 +42,7 @@</span><br><span>       printk(BIOS_DEBUG, "done.\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void usb_set_subsystem(device_t dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+static void usb_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span>                    unsigned int device)</span><br><span> {</span><br><span>    if (!vendor || !device) {</span><br><span>diff --git a/src/southbridge/intel/i82801gx/usb_ehci.c b/src/southbridge/intel/i82801gx/usb_ehci.c</span><br><span>index 6ed2dcb..e6dd6c9 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/usb_ehci.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/usb_ehci.c</span><br><span>@@ -58,7 +58,7 @@</span><br><span>       printk(BIOS_DEBUG, "done.\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void usb_ehci_set_subsystem(device_t dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+static void usb_ehci_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span>                          unsigned int device)</span><br><span> {</span><br><span>    u8 access_cntl;</span><br><span>diff --git a/src/southbridge/intel/i82801gx/watchdog.c b/src/southbridge/intel/i82801gx/watchdog.c</span><br><span>index 9365e89..ac2de3a 100644</span><br><span>--- a/src/southbridge/intel/i82801gx/watchdog.c</span><br><span>+++ b/src/southbridge/intel/i82801gx/watchdog.c</span><br><span>@@ -22,7 +22,7 @@</span><br><span> </span><br><span> void watchdog_off(void)</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>  unsigned long value, base;</span><br><span> </span><br><span>       /* Turn off the ICH7 watchdog. */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26245">change 26245</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/26245"/><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: Iccddf3140fd94c2e5a246fe2839573f5dd387147 </div>
<div style="display:none"> Gerrit-Change-Number: 26245 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>