[coreboot-gerrit] Change in coreboot[master]: src/drivers/{net, usb}: Use pci_devfn_t instead of device_t

[Elyes HAOUAS (Code Review)]

Elyes HAOUAS has uploaded this change for review. ( https://review.coreboot.org/26993


Change subject: src/drivers/{net,usb}: Use pci_devfn_t instead of device_t
......................................................................

src/drivers/{net,usb}: Use pci_devfn_t instead of device_t

Change-Id: I9091cf92b98409603dadfeb1e1ad274ca73f1ae9
Signed-off-by: Elyes HAOUAS <ehaouas at noos.fr>
---
M src/drivers/net/ne2k.c
M src/drivers/usb/pci_ehci.c
2 files changed, 7 insertions(+), 3 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/93/26993/1

diff --git a/src/drivers/net/ne2k.c b/src/drivers/net/ne2k.c
index 96f4d70..75f3357 100644
--- a/src/drivers/net/ne2k.c
+++ b/src/drivers/net/ne2k.c
@@ -273,7 +273,11 @@
 
 int ne2k_init(unsigned int eth_nic_base) {
 
-	device_t dev;
+#ifdef __SIMPLE_DEVICE__
+	pci_devfn_t dev;
+#else
+	struct device *dev;
+#endif
 	unsigned char c;
 
 	/* Power management controller */
diff --git a/src/drivers/usb/pci_ehci.c b/src/drivers/usb/pci_ehci.c
index 3bdeeeb..2f529e9 100644
--- a/src/drivers/usb/pci_ehci.c
+++ b/src/drivers/usb/pci_ehci.c
@@ -37,7 +37,7 @@
 #ifdef __SIMPLE_DEVICE__
 	pci_devfn_t dev = dbg_dev;
 #else
-	device_t dev = dev_find_slot(PCI_DEV2SEGBUS(dbg_dev), PCI_DEV2DEVFN(dbg_dev));
+	struct device *dev = dev_find_slot(PCI_DEV2SEGBUS(dbg_dev), PCI_DEV2DEVFN(dbg_dev));
 #endif
 
 	u32 class = pci_read_config32(dev, PCI_CLASS_REVISION) >> 8;
@@ -123,7 +123,7 @@
 #ifdef __SIMPLE_DEVICE__
 	u8 *base = (u8 *)(pci_read_config32(sdev, EHCI_BAR_INDEX) & ~0x0f);
 #else
-	device_t dev = dev_find_slot(PCI_DEV2SEGBUS(sdev), PCI_DEV2DEVFN(sdev));
+	struct device *dev = dev_find_slot(PCI_DEV2SEGBUS(sdev), PCI_DEV2DEVFN(sdev));
 	u8 *base = (u8 *)(pci_read_config32(dev, EHCI_BAR_INDEX) & ~0x0f);
 #endif
 	return base + HC_LENGTH(read32(base));

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

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9091cf92b98409603dadfeb1e1ad274ca73f1ae9
Gerrit-Change-Number: 26993
Gerrit-PatchSet: 1
Gerrit-Owner: Elyes HAOUAS <ehaouas at noos.fr>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180609/35b609fa/attachment.html>