diff options
| author | Elyes HAOUAS <ehaouas@noos.fr> | 2018-06-10 23:36:44 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-06-14 09:29:31 +0000 |
| commit | c8a649c08f92d4d2255626da4e1cd7a6d71469e7 (patch) | |
| tree | 14a899738d09b37030585aca3b59344595208e36 /src/drivers | |
| parent | 846b4941fee842bc359fa2b611cf0c3fc4f158b2 (diff) | |
src: Use of device_t is deprecated
Change-Id: I9cebfc5c77187bd81094031c43ff6df094908417
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/27010
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/net/ne2k.c | 6 | ||||
| -rw-r--r-- | src/drivers/usb/pci_ehci.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/drivers/net/ne2k.c b/src/drivers/net/ne2k.c index 96f4d703a4..75f3357c1c 100644 --- a/src/drivers/net/ne2k.c +++ b/src/drivers/net/ne2k.c @@ -273,7 +273,11 @@ static void ns8390_reset(unsigned int eth_nic_base) 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 3bdeeebadc..a61779cc7a 100644 --- a/src/drivers/usb/pci_ehci.c +++ b/src/drivers/usb/pci_ehci.c @@ -37,7 +37,8 @@ int ehci_debug_hw_enable(unsigned int *base, unsigned int *dbg_offset) #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 +124,8 @@ u8 *pci_ehci_base_regs(pci_devfn_t sdev) #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)); |