commit 1dcd8dbf760cd7b324d3a20f9e5f1c36fa95b5eb
author Elyes HAOUAS <ehaouas@noos.fr> Wed Dec 05 10:59:42 2018 +0100
committer Patrick Georgi <pgeorgi@google.com> Fri Dec 07 11:22:20 2018 +0000
tree 85194b06b38468c7614820346f2aba4442477ebc
parent 012ef7735d6878ef63aa0315863636bfb88e6c1f

src/southbridge: Get rid of device_t

Use of device_t is deprecated.

Change-Id: Ib4db9c263ff156966926f9576eed7e3cfb02e78a
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/30045
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>

src/southbridge/intel/lynxpoint/usb_xhci.c

diff --git a/src/southbridge/intel/lynxpoint/usb_xhci.c b/src/southbridge/intel/lynxpoint/usb_xhci.c
index 186e3f9..03341da 100644
--- a/src/southbridge/intel/lynxpoint/usb_xhci.c
+++ b/src/southbridge/intel/lynxpoint/usb_xhci.c
@@ -23,7 +23,11 @@
 
 typedef struct southbridge_intel_lynxpoint_config config_t;
 
-static u8 *usb_xhci_mem_base(device_t dev)
+#ifdef __SIMPLE_DEVICE__
+static u8 *usb_xhci_mem_base(pci_devfn_t dev)
+#else
+static u8 *usb_xhci_mem_base(struct device *dev)
+#endif
 {
 	u32 mem_base = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
 
@@ -34,7 +38,11 @@
 	return (u8 *)(mem_base & ~0xf);
 }
 
-static int usb_xhci_port_count_usb3(device_t dev)
+#ifdef __SIMPLE_DEVICE__
+static int usb_xhci_port_count_usb3(pci_devfn_t dev)
+#else
+static int usb_xhci_port_count_usb3(struct device *dev)
+#endif
 {
 	if (pch_is_lp()) {
 		/* LynxPoint-LP has 4 SS ports */
@@ -81,7 +89,11 @@
  *  b) Poll for warm reset complete
  *  c) Write 1 to port change status bits
  */
-static void usb_xhci_reset_usb3(device_t dev, int all)
+#ifdef __SIMPLE_DEVICE__
+static void usb_xhci_reset_usb3(pci_devfn_t dev, int all)
+#else
+static void usb_xhci_reset_usb3(struct device *dev, int all)
+#endif
 {
 	u32 status, port_disabled;
 	int timeout, port;