<p>Patrick Georgi <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/26403">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Patrick Georgi: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sb/broadcom/bcm5785: Get rid of device_t<br><br>Use of device_t has been abandoned in ramstage.<br><br>Change-Id: Ia39347f9d07bb0055ea4686a8b319f323f68062e<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>Reviewed-on: https://review.coreboot.org/26403<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M src/southbridge/broadcom/bcm5785/bcm5785.c<br>M src/southbridge/broadcom/bcm5785/bcm5785.h<br>M src/southbridge/broadcom/bcm5785/ide.c<br>M src/southbridge/broadcom/bcm5785/lpc.c<br>M src/southbridge/broadcom/bcm5785/sata.c<br>M src/southbridge/broadcom/bcm5785/sb_pci_main.c<br>M src/southbridge/broadcom/bcm5785/usb.c<br>7 files changed, 26 insertions(+), 21 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/southbridge/broadcom/bcm5785/bcm5785.c b/src/southbridge/broadcom/bcm5785/bcm5785.c</span><br><span>index 60f7da0..6375805 100644</span><br><span>--- a/src/southbridge/broadcom/bcm5785/bcm5785.c</span><br><span>+++ b/src/southbridge/broadcom/bcm5785/bcm5785.c</span><br><span>@@ -20,10 +20,10 @@</span><br><span> #include <device/pci_ids.h></span><br><span> #include "bcm5785.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void bcm5785_enable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void bcm5785_enable(struct device *dev)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- device_t sb_pci_main_dev;</span><br><span style="color: hsl(0, 100%, 40%);">- device_t bus_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *sb_pci_main_dev;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct device *bus_dev;</span><br><span> // unsigned index;</span><br><span> </span><br><span> /* See if we are on the behind the pcix bridge */</span><br><span>diff --git a/src/southbridge/broadcom/bcm5785/bcm5785.h b/src/southbridge/broadcom/bcm5785/bcm5785.h</span><br><span>index 893a46c..f1af153 100644</span><br><span>--- a/src/southbridge/broadcom/bcm5785/bcm5785.h</span><br><span>+++ b/src/southbridge/broadcom/bcm5785/bcm5785.h</span><br><span>@@ -20,7 +20,7 @@</span><br><span> #include "chip.h"</span><br><span> </span><br><span> #ifndef __PRE_RAM__</span><br><span style="color: hsl(0, 100%, 40%);">-void bcm5785_enable(device_t dev);</span><br><span style="color: hsl(120, 100%, 40%);">+void bcm5785_enable(struct device *dev);</span><br><span> #else</span><br><span> void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn);</span><br><span> #endif</span><br><span>diff --git a/src/southbridge/broadcom/bcm5785/ide.c b/src/southbridge/broadcom/bcm5785/ide.c</span><br><span>index a6bb204..9dd0604 100644</span><br><span>--- a/src/southbridge/broadcom/bcm5785/ide.c</span><br><span>+++ b/src/southbridge/broadcom/bcm5785/ide.c</span><br><span>@@ -21,7 +21,7 @@</span><br><span> #include <device/pci_ops.h></span><br><span> #include "bcm5785.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void bcm5785_ide_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void bcm5785_ide_read_resources(struct device *dev)</span><br><span> {</span><br><span> /* Get the normal pci resources of this device */</span><br><span> pci_dev_read_resources(dev);</span><br><span>@@ -36,7 +36,8 @@</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,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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/broadcom/bcm5785/lpc.c b/src/southbridge/broadcom/bcm5785/lpc.c</span><br><span>index 05dbbc3..b10c23f 100644</span><br><span>--- a/src/southbridge/broadcom/bcm5785/lpc.c</span><br><span>+++ b/src/southbridge/broadcom/bcm5785/lpc.c</span><br><span>@@ -26,7 +26,7 @@</span><br><span> #include <arch/ioapic.h></span><br><span> #include "bcm5785.h"</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> /* Initialize the real time clock */</span><br><span> cmos_init(0);</span><br><span>@@ -35,7 +35,7 @@</span><br><span> isa_dma_init();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void bcm5785_lpc_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void bcm5785_lpc_read_resources(struct device *dev)</span><br><span> {</span><br><span> struct resource *res;</span><br><span> </span><br><span>@@ -66,7 +66,7 @@</span><br><span> *</span><br><span> * @param dev The device whos children's resources are to be enabled.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-static void bcm5785_lpc_enable_childrens_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void bcm5785_lpc_enable_childrens_resources(struct device *dev)</span><br><span> {</span><br><span> struct bus *link;</span><br><span> uint32_t reg;</span><br><span>@@ -74,7 +74,7 @@</span><br><span> reg = pci_read_config8(dev, 0x44);</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>@@ -110,13 +110,14 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void bcm5785_lpc_enable_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void bcm5785_lpc_enable_resources(struct device *dev)</span><br><span> {</span><br><span> pci_dev_enable_resources(dev);</span><br><span> bcm5785_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,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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/broadcom/bcm5785/sata.c b/src/southbridge/broadcom/bcm5785/sata.c</span><br><span>index 57df3d2..007a2fa 100644</span><br><span>--- a/src/southbridge/broadcom/bcm5785/sata.c</span><br><span>+++ b/src/southbridge/broadcom/bcm5785/sata.c</span><br><span>@@ -68,7 +68,8 @@</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,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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/broadcom/bcm5785/sb_pci_main.c b/src/southbridge/broadcom/bcm5785/sb_pci_main.c</span><br><span>index c129434..5d98e7b 100644</span><br><span>--- a/src/southbridge/broadcom/bcm5785/sb_pci_main.c</span><br><span>+++ b/src/southbridge/broadcom/bcm5785/sb_pci_main.c</span><br><span>@@ -29,7 +29,7 @@</span><br><span> </span><br><span> #define NMI_OFF 0</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void sb_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void sb_init(struct device *dev)</span><br><span> {</span><br><span> uint8_t byte;</span><br><span> uint8_t byte_old;</span><br><span>@@ -52,7 +52,7 @@</span><br><span> </span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void bcm5785_sb_read_resources(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void bcm5785_sb_read_resources(struct device *dev)</span><br><span> {</span><br><span> struct resource *res;</span><br><span> </span><br><span>@@ -72,7 +72,7 @@</span><br><span> </span><br><span> }</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>@@ -86,7 +86,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, uint8_t val)</span><br><span style="color: hsl(120, 100%, 40%);">+static int lsmbus_send_byte(struct device *dev, uint8_t val)</span><br><span> {</span><br><span> unsigned device;</span><br><span> struct resource *res;</span><br><span>@@ -100,7 +100,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, uint8_t address)</span><br><span style="color: hsl(120, 100%, 40%);">+static int lsmbus_read_byte(struct device *dev, uint8_t address)</span><br><span> {</span><br><span> unsigned device;</span><br><span> struct resource *res;</span><br><span>@@ -114,7 +114,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, uint8_t address, uint8_t val)</span><br><span style="color: hsl(120, 100%, 40%);">+static int lsmbus_write_byte(struct device *dev, uint8_t address, uint8_t val)</span><br><span> {</span><br><span> unsigned device;</span><br><span> struct resource *res;</span><br><span>@@ -135,7 +135,8 @@</span><br><span> .write_byte = lsmbus_write_byte,</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,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned device)</span><br><span> {</span><br><span> pci_write_config32(dev, 0x2c,</span><br><span> ((device & 0xffff) << 16) | (vendor & 0xffff));</span><br><span>diff --git a/src/southbridge/broadcom/bcm5785/usb.c b/src/southbridge/broadcom/bcm5785/usb.c</span><br><span>index 9aa64df..ab8e588 100644</span><br><span>--- a/src/southbridge/broadcom/bcm5785/usb.c</span><br><span>+++ b/src/southbridge/broadcom/bcm5785/usb.c</span><br><span>@@ -33,7 +33,8 @@</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,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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/26403">change 26403</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/26403"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia39347f9d07bb0055ea4686a8b319f323f68062e </div>
<div style="display:none"> Gerrit-Change-Number: 26403 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>