diff options
Diffstat (limited to 'src/interface')
| -rw-r--r-- | src/interface/efi/efi_pci.c | 19 | ||||
| -rw-r--r-- | src/interface/efi/efi_snp.c | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/interface/efi/efi_pci.c b/src/interface/efi/efi_pci.c index 9a402c447..c240d4cb7 100644 --- a/src/interface/efi/efi_pci.c +++ b/src/interface/efi/efi_pci.c @@ -35,8 +35,9 @@ EFI_REQUIRE_PROTOCOL ( EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL, &efipci ); static unsigned long efipci_address ( struct pci_device *pci, unsigned long location ) { - return EFI_PCI_ADDRESS ( pci->bus, PCI_SLOT ( pci->devfn ), - PCI_FUNC ( pci->devfn ), + return EFI_PCI_ADDRESS ( PCI_BUS ( pci->busdevfn ), + PCI_SLOT ( pci->busdevfn ), + PCI_FUNC ( pci->busdevfn ), EFIPCI_OFFSET ( location ) ); } @@ -47,10 +48,9 @@ int efipci_read ( struct pci_device *pci, unsigned long location, if ( ( efirc = efipci->Pci.Read ( efipci, EFIPCI_WIDTH ( location ), efipci_address ( pci, location ), 1, value ) ) != 0 ) { - DBG ( "EFIPCI config read from %02x:%02x.%x offset %02lx " - "failed: %s\n", pci->bus, PCI_SLOT ( pci->devfn ), - PCI_FUNC ( pci->devfn ), EFIPCI_OFFSET ( location ), - efi_strerror ( efirc ) ); + DBG ( "EFIPCI config read from " PCI_FMT " offset %02lx " + "failed: %s\n", PCI_ARGS ( pci ), + EFIPCI_OFFSET ( location ), efi_strerror ( efirc ) ); return -EIO; } @@ -64,10 +64,9 @@ int efipci_write ( struct pci_device *pci, unsigned long location, if ( ( efirc = efipci->Pci.Write ( efipci, EFIPCI_WIDTH ( location ), efipci_address ( pci, location ), 1, &value ) ) != 0 ) { - DBG ( "EFIPCI config write to %02x:%02x.%x offset %02lx " - "failed: %s\n", pci->bus, PCI_SLOT ( pci->devfn ), - PCI_FUNC ( pci->devfn ), EFIPCI_OFFSET ( location ), - efi_strerror ( efirc ) ); + DBG ( "EFIPCI config write to " PCI_FMT " offset %02lx " + "failed: %s\n", PCI_ARGS ( pci ), + EFIPCI_OFFSET ( location ), efi_strerror ( efirc ) ); return -EIO; } diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c index 43620f57e..6bfa18884 100644 --- a/src/interface/efi/efi_snp.c +++ b/src/interface/efi/efi_snp.c @@ -794,7 +794,7 @@ efi_snp_netdev ( EFI_DRIVER_BINDING_PROTOCOL *driver, EFI_HANDLE device ) { ( ( unsigned long ) pci_fn ) ); /* Look up corresponding network device */ - pci_busdevfn = PCI_BUSDEVFN ( pci_bus, PCI_DEVFN ( pci_dev, pci_fn ) ); + pci_busdevfn = PCI_BUSDEVFN ( pci_bus, pci_dev, pci_fn ); if ( ( netdev = find_netdev_by_location ( BUS_TYPE_PCI, pci_busdevfn ) ) == NULL ) { DBGCP ( driver, "SNPDRV %p device %p is not a iPXE network " |