[coreboot-gerrit] Change in ...coreboot[master]: sb/intel/lynxpoint/usb_{e, x}hci.c: Don't use device_t

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/29932 )

Change subject: sb/intel/lynxpoint/usb_{e,x}hci.c: Don't use device_t
......................................................................

sb/intel/lynxpoint/usb_{e,x}hci.c: Don't use device_t

Use of device_t is deprecated.

Change-Id: Ie75450c844e2317ded157465eb0fc6a9ec1b3ab0
Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
Reviewed-on: https://review.coreboot.org/c/29932
Reviewed-by: Patrick Rudolph <siro at das-labor.org>
Tested-by: build bot (Jenkins) <no-reply at coreboot.org>
---
M src/southbridge/intel/lynxpoint/usb_ehci.c
M src/southbridge/intel/lynxpoint/usb_xhci.c
2 files changed, 9 insertions(+), 8 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Patrick Rudolph: Looks good to me, approved



diff --git a/src/southbridge/intel/lynxpoint/usb_ehci.c b/src/southbridge/intel/lynxpoint/usb_ehci.c
index e2486cf..7f300d6 100644
--- a/src/southbridge/intel/lynxpoint/usb_ehci.c
+++ b/src/southbridge/intel/lynxpoint/usb_ehci.c
@@ -25,7 +25,7 @@
 
 #ifdef __SMM__
 
-void usb_ehci_disable(device_t dev)
+void usb_ehci_disable(pci_devfn_t dev)
 {
 	u16 reg16;
 	u32 reg32;
@@ -57,7 +57,7 @@
 }
 
 /* Handler for EHCI controller on entry to S3/S4/S5 */
-void usb_ehci_sleep_prepare(device_t dev, u8 slp_typ)
+void usb_ehci_sleep_prepare(pci_devfn_t dev, u8 slp_typ)
 {
 	u32 reg32;
 	u8 *bar0_base;
@@ -164,7 +164,8 @@
 	printk(BIOS_DEBUG, "done.\n");
 }
 
-static void usb_ehci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
+static void usb_ehci_set_subsystem(struct device *dev, unsigned int vendor,
+				   unsigned int device)
 {
 	u8 access_cntl;
 
diff --git a/src/southbridge/intel/lynxpoint/usb_xhci.c b/src/southbridge/intel/lynxpoint/usb_xhci.c
index af0e56f..186e3f9 100644
--- a/src/southbridge/intel/lynxpoint/usb_xhci.c
+++ b/src/southbridge/intel/lynxpoint/usb_xhci.c
@@ -154,7 +154,7 @@
 #ifdef __SMM__
 
 /* Handler for XHCI controller on entry to S3/S4/S5 */
-void usb_xhci_sleep_prepare(device_t dev, u8 slp_typ)
+void usb_xhci_sleep_prepare(pci_devfn_t dev, u8 slp_typ)
 {
 	u16 reg16;
 	u32 reg32;
@@ -238,7 +238,7 @@
 
 #else /* !__SMM__ */
 
-static void usb_xhci_clock_gating(device_t dev)
+static void usb_xhci_clock_gating(struct device *dev)
 {
 	u32 reg32;
 	u16 reg16;
@@ -285,7 +285,7 @@
 	pci_write_config32(dev, 0xa4, reg32);
 }
 
-static void usb_xhci_init(device_t dev)
+static void usb_xhci_init(struct device *dev)
 {
 	u32 reg32;
 	u16 reg16;
@@ -359,8 +359,8 @@
 	}
 }
 
-static void usb_xhci_set_subsystem(device_t dev, unsigned vendor,
-				   unsigned device)
+static void usb_xhci_set_subsystem(struct device *dev, unsigned int vendor,
+				   unsigned int device)
 {
 	if (!vendor || !device) {
 		pci_write_config32(dev, PCI_SUBSYSTEM_VENDOR_ID,

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/29932
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ie75450c844e2317ded157465eb0fc6a9ec1b3ab0
Gerrit-Change-Number: 29932
Gerrit-PatchSet: 4
Gerrit-Owner: HAOUAS Elyes <ehaouas at noos.fr>
Gerrit-Reviewer: HAOUAS Elyes <ehaouas at noos.fr>
Gerrit-Reviewer: Patrick Georgi <pgeorgi at google.com>
Gerrit-Reviewer: Patrick Rudolph <siro at das-labor.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply at coreboot.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181203/36cb4761/attachment.html>