1 files changed, 4 insertions, 34 deletions

diff --git a/src/interface/efi/efi_utils.c b/src/interface/efi/efi_utils.c
index 4dc75414c..8e660e9d7 100644
--- a/src/interface/efi/efi_utils.c
+++ b/src/interface/efi/efi_utils.c
@@ -33,36 +33,6 @@ FILE_LICENCE ( GPL2_OR_LATER );
  */
 
 /**
- * Find end of device path
- *
- * @v path		Path to device
- * @ret path_end	End of device path
- */
-EFI_DEVICE_PATH_PROTOCOL * efi_devpath_end ( EFI_DEVICE_PATH_PROTOCOL *path ) {
-
-	while ( path->Type != END_DEVICE_PATH_TYPE ) {
-		path = ( ( ( void * ) path ) +
-			 /* There's this amazing new-fangled thing known as
-			  * a UINT16, but who wants to use one of those? */
-			 ( ( path->Length[1] << 8 ) | path->Length[0] ) );
-	}
-
-	return path;
-}
-
-/**
- * Find length of device path (excluding terminator)
- *
- * @v path		Path to device
- * @ret path_len	Length of device path
- */
-size_t efi_devpath_len ( EFI_DEVICE_PATH_PROTOCOL *path ) {
-	EFI_DEVICE_PATH_PROTOCOL *end = efi_devpath_end ( path );
-
-	return ( ( ( void * ) end ) - ( ( void * ) path ) );
-}
-
-/**
  * Locate parent device supporting a given protocol
  *
  * @v device		EFI device handle
@@ -175,7 +145,7 @@ void efi_child_del ( EFI_HANDLE parent, EFI_HANDLE child ) {
 static int efi_pci_info ( EFI_HANDLE device, const char *prefix,
 			  struct device *dev ) {
 	EFI_HANDLE pci_device;
-	struct pci_device pci;
+	struct efi_pci_device efipci;
 	int rc;
 
 	/* Find parent PCI device */
@@ -187,16 +157,16 @@ static int efi_pci_info ( EFI_HANDLE device, const char *prefix,
 	}
 
 	/* Get PCI device information */
-	if ( ( rc = efipci_info ( pci_device, &pci ) ) != 0 ) {
+	if ( ( rc = efipci_info ( pci_device, &efipci ) ) != 0 ) {
 		DBGC ( device, "EFIDEV %s could not get PCI information: %s\n",
 		       efi_handle_name ( device ), strerror ( rc ) );
 		return rc;
 	}
 
 	/* Populate device information */
-	memcpy ( &dev->desc, &pci.dev.desc, sizeof ( dev->desc ) );
+	memcpy ( &dev->desc, &efipci.pci.dev.desc, sizeof ( dev->desc ) );
 	snprintf ( dev->name, sizeof ( dev->name ), "%s-%s",
-		   prefix, pci.dev.name );
+		   prefix, efipci.pci.dev.name );
 
 	return 0;
 }