<p>Patrick Georgi <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/c/coreboot/+/29932">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Patrick Rudolph: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sb/intel/lynxpoint/usb_{e,x}hci.c: Don't use device_t<br><br>Use of device_t is deprecated.<br><br>Change-Id: Ie75450c844e2317ded157465eb0fc6a9ec1b3ab0<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>Reviewed-on: https://review.coreboot.org/c/29932<br>Reviewed-by: Patrick Rudolph <siro@das-labor.org><br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>---<br>M src/southbridge/intel/lynxpoint/usb_ehci.c<br>M src/southbridge/intel/lynxpoint/usb_xhci.c<br>2 files changed, 9 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/southbridge/intel/lynxpoint/usb_ehci.c b/src/southbridge/intel/lynxpoint/usb_ehci.c</span><br><span>index e2486cf..7f300d6 100644</span><br><span>--- a/src/southbridge/intel/lynxpoint/usb_ehci.c</span><br><span>+++ b/src/southbridge/intel/lynxpoint/usb_ehci.c</span><br><span>@@ -25,7 +25,7 @@</span><br><span> </span><br><span> #ifdef __SMM__</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void usb_ehci_disable(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+void usb_ehci_disable(pci_devfn_t dev)</span><br><span> {</span><br><span> u16 reg16;</span><br><span> u32 reg32;</span><br><span>@@ -57,7 +57,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Handler for EHCI controller on entry to S3/S4/S5 */</span><br><span style="color: hsl(0, 100%, 40%);">-void usb_ehci_sleep_prepare(device_t dev, u8 slp_typ)</span><br><span style="color: hsl(120, 100%, 40%);">+void usb_ehci_sleep_prepare(pci_devfn_t dev, u8 slp_typ)</span><br><span> {</span><br><span> u32 reg32;</span><br><span> u8 *bar0_base;</span><br><span>@@ -164,7 +164,8 @@</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 vendor, unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void usb_ehci_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int device)</span><br><span> {</span><br><span> u8 access_cntl;</span><br><span> </span><br><span>diff --git a/src/southbridge/intel/lynxpoint/usb_xhci.c b/src/southbridge/intel/lynxpoint/usb_xhci.c</span><br><span>index af0e56f..186e3f9 100644</span><br><span>--- a/src/southbridge/intel/lynxpoint/usb_xhci.c</span><br><span>+++ b/src/southbridge/intel/lynxpoint/usb_xhci.c</span><br><span>@@ -154,7 +154,7 @@</span><br><span> #ifdef __SMM__</span><br><span> </span><br><span> /* Handler for XHCI controller on entry to S3/S4/S5 */</span><br><span style="color: hsl(0, 100%, 40%);">-void usb_xhci_sleep_prepare(device_t dev, u8 slp_typ)</span><br><span style="color: hsl(120, 100%, 40%);">+void usb_xhci_sleep_prepare(pci_devfn_t dev, u8 slp_typ)</span><br><span> {</span><br><span> u16 reg16;</span><br><span> u32 reg32;</span><br><span>@@ -238,7 +238,7 @@</span><br><span> </span><br><span> #else /* !__SMM__ */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void usb_xhci_clock_gating(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void usb_xhci_clock_gating(struct device *dev)</span><br><span> {</span><br><span> u32 reg32;</span><br><span> u16 reg16;</span><br><span>@@ -285,7 +285,7 @@</span><br><span> pci_write_config32(dev, 0xa4, reg32);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void usb_xhci_init(device_t dev)</span><br><span style="color: hsl(120, 100%, 40%);">+static void usb_xhci_init(struct device *dev)</span><br><span> {</span><br><span> u32 reg32;</span><br><span> u16 reg16;</span><br><span>@@ -359,8 +359,8 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void usb_xhci_set_subsystem(device_t dev, unsigned vendor,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned device)</span><br><span style="color: hsl(120, 100%, 40%);">+static void usb_xhci_set_subsystem(struct device *dev, unsigned int vendor,</span><br><span style="color: hsl(120, 100%, 40%);">+ 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></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/29932">change 29932</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/c/coreboot/+/29932"/><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-Change-Id: Ie75450c844e2317ded157465eb0fc6a9ec1b3ab0 </div>
<div style="display:none"> Gerrit-Change-Number: 29932 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: HAOUAS Elyes <ehaouas@noos.fr> </div>
<div style="display:none"> Gerrit-Reviewer: HAOUAS Elyes <ehaouas@noos.fr> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>