<p>Elyes HAOUAS has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26401">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sb/nvidia/ck804: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: I59078ff96428d134f108ff2551556c8a7d2d3b37<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>---<br>M src/southbridge/nvidia/ck804/ck804.c<br>M src/southbridge/nvidia/ck804/ht.c<br>M src/southbridge/nvidia/ck804/lpc.c<br>M src/southbridge/nvidia/ck804/pci.c<br>M src/southbridge/nvidia/ck804/smbus.c<br>5 files changed, 21 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/01/26401/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/southbridge/nvidia/ck804/ck804.c b/src/southbridge/nvidia/ck804/ck804.c</span><br><span>index 38988f5..3102c15 100644</span><br><span>--- a/src/southbridge/nvidia/ck804/ck804.c</span><br><span>+++ b/src/southbridge/nvidia/ck804/ck804.c</span><br><span>@@ -24,9 +24,9 @@</span><br><span> </span><br><span> static u32 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 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>   if (!lpc_dev)</span><br><span>@@ -53,9 +53,9 @@</span><br><span>    return lpc_dev;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ck804_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ck804_enable(struct device *dev)</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>      unsigned index = 0, index2 = 0, deviceid, vendorid, devfn;</span><br><span>   u32 reg_old, reg;</span><br><span>    u8 byte;</span><br><span>@@ -184,7 +184,7 @@</span><br><span>       }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ck804_set_subsystem(device_t dev, unsigned vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ck804_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/nvidia/ck804/ht.c b/src/southbridge/nvidia/ck804/ht.c</span><br><span>index 5f8b213..48b18cb 100644</span><br><span>--- a/src/southbridge/nvidia/ck804/ht.c</span><br><span>+++ b/src/southbridge/nvidia/ck804/ht.c</span><br><span>@@ -26,7 +26,7 @@</span><br><span> </span><br><span> unsigned long acpi_fill_mcfg(unsigned long current)</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 mcfg_base;</span><br><span> </span><br><span>         dev = dev_find_slot(0x0, PCI_DEVFN(0x0,0));</span><br><span>diff --git a/src/southbridge/nvidia/ck804/lpc.c b/src/southbridge/nvidia/ck804/lpc.c</span><br><span>index 2b0bdd5..2c7519b 100644</span><br><span>--- a/src/southbridge/nvidia/ck804/lpc.c</span><br><span>+++ b/src/southbridge/nvidia/ck804/lpc.c</span><br><span>@@ -51,7 +51,7 @@</span><br><span> #define CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL MAINBOARD_POWER_ON</span><br><span> #endif</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>   u32 dword;</span><br><span>   struct resource *res;</span><br><span>@@ -68,12 +68,12 @@</span><br><span> #endif</span><br><span> }</span><br><span> </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> </span><br><span style="color: hsl(0, 100%, 40%);">-static void rom_dummy_write(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void rom_dummy_write(struct device *dev)</span><br><span> {</span><br><span>        u8 old, new;</span><br><span>         u8 *p;</span><br><span>@@ -103,7 +103,7 @@</span><br><span> </span><br><span> unsigned pm_base = 0;</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>       u8 byte, byte_old;</span><br><span>   int on, nmi_option;</span><br><span>@@ -158,7 +158,7 @@</span><br><span>    rom_dummy_write(dev);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ck804_lpc_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ck804_lpc_read_resources(struct device *dev)</span><br><span> {</span><br><span>      struct resource *res;</span><br><span>        unsigned long index;</span><br><span>@@ -203,7 +203,7 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ck804_lpc_set_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ck804_lpc_set_resources(struct device *dev)</span><br><span> {</span><br><span>    u8 byte;</span><br><span>     struct resource *res;</span><br><span>@@ -239,7 +239,7 @@</span><br><span>  * This function is called by the global enable_resources() indirectly via the</span><br><span>  * device_operation::enable_resources() method of devices.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-static void ck804_lpc_enable_childrens_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ck804_lpc_enable_childrens_resources(struct device *dev)</span><br><span> {</span><br><span>  struct bus *link;</span><br><span>    u32 reg, reg_var[4];</span><br><span>@@ -248,7 +248,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>@@ -295,7 +295,7 @@</span><br><span>          pci_write_config32(dev, 0xa8 + i * 4, reg_var[i]);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void ck804_lpc_enable_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void ck804_lpc_enable_resources(struct device *dev)</span><br><span> {</span><br><span>     pci_dev_enable_resources(dev);</span><br><span>       ck804_lpc_enable_childrens_resources(dev);</span><br><span>@@ -303,7 +303,7 @@</span><br><span> </span><br><span> #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void southbridge_acpi_fill_ssdt_generator(device_t device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void southbridge_acpi_fill_ssdt_generator(struct device *device)</span><br><span> {</span><br><span>   amd_generate_powernow(0, 0, 0);</span><br><span> }</span><br><span>diff --git a/src/southbridge/nvidia/ck804/pci.c b/src/southbridge/nvidia/ck804/pci.c</span><br><span>index a9f0f5b..d4b074d 100644</span><br><span>--- a/src/southbridge/nvidia/ck804/pci.c</span><br><span>+++ b/src/southbridge/nvidia/ck804/pci.c</span><br><span>@@ -25,7 +25,7 @@</span><br><span> static void pci_init(struct device *dev)</span><br><span> {</span><br><span>       u32 dword;</span><br><span style="color: hsl(0, 100%, 40%);">-      device_t pci_domain_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct device *pci_domain_dev;</span><br><span>       struct resource *mem, *pref;</span><br><span> </span><br><span>     dword = pci_read_config32(dev, 0x04);</span><br><span>diff --git a/src/southbridge/nvidia/ck804/smbus.c b/src/southbridge/nvidia/ck804/smbus.c</span><br><span>index e3b38dd..4a4ac2f 100644</span><br><span>--- a/src/southbridge/nvidia/ck804/smbus.c</span><br><span>+++ b/src/southbridge/nvidia/ck804/smbus.c</span><br><span>@@ -24,7 +24,7 @@</span><br><span> #include "chip.h"</span><br><span> #include "smbus.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int lsmbus_recv_byte(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static int lsmbus_recv_byte(struct device *dev)</span><br><span> {</span><br><span>     unsigned device;</span><br><span>     struct resource *res;</span><br><span>@@ -38,7 +38,7 @@</span><br><span>    return do_smbus_recv_byte(res->base, device);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int lsmbus_send_byte(device_t dev, u8 val)</span><br><span style="color: hsl(120, 100%, 40%);">+static int lsmbus_send_byte(struct device *dev, u8 val)</span><br><span> {</span><br><span>     unsigned device;</span><br><span>     struct resource *res;</span><br><span>@@ -52,7 +52,7 @@</span><br><span>    return do_smbus_send_byte(res->base, device, val);</span><br><span> }</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>        unsigned device;</span><br><span>     struct resource *res;</span><br><span>@@ -66,7 +66,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 val)</span><br><span style="color: hsl(120, 100%, 40%);">+static int lsmbus_write_byte(struct device *dev, u8 address, u8 val)</span><br><span> {</span><br><span>  unsigned device;</span><br><span>     struct resource *res;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26401">change 26401</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/26401"/><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: I59078ff96428d134f108ff2551556c8a7d2d3b37 </div>
<div style="display:none"> Gerrit-Change-Number: 26401 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>