[efi] Use efi_handle_name() instead of efi_handle_devpath_text()

Signed-off-by: Michael Brown <mcb30@ipxe.org>

1 files changed, 24 insertions, 25 deletions

diff --git a/src/interface/efi/efi_driver.c b/src/interface/efi/efi_driver.c
index 6ebfee5b..c67d6d65 100644
--- a/src/interface/efi/efi_driver.c
+++ b/src/interface/efi/efi_driver.c
@@ -134,16 +134,15 @@ int efidev_child_add ( struct efi_device *efidev, EFI_HANDLE device ) {
 					  ) ) != 0 ) {
 		rc = -EEFI ( efirc );
 		DBGC ( efidev->device, "EFIDRV %p %s could not add child",
-		       efidev->device, efi_devpath_text ( efidev->path ) );
+		       efidev->device, efi_handle_name ( efidev->device ) );
 		DBGC ( efidev->device, " %p %s: %s\n", device,
-		       efi_handle_devpath_text ( device ), strerror ( rc ) );
+		       efi_handle_name ( device ), strerror ( rc ) );
 		return rc;
 	}
 
 	DBGC2 ( efidev->device, "EFIDRV %p %s added child",
-		efidev->device, efi_devpath_text ( efidev->path ) );
-	DBGC2 ( efidev->device, " %p %s\n",
-		device, efi_handle_devpath_text ( device ) );
+		efidev->device, efi_handle_name ( efidev->device ) );
+	DBGC2 ( efidev->device, " %p %s\n", device, efi_handle_name ( device ));
 	return 0;
 }
 
@@ -161,9 +160,9 @@ void efidev_child_del ( struct efi_device *efidev, EFI_HANDLE device ) {
 			    &efi_device_path_protocol_guid,
 			    efi_image_handle, device );
 	DBGC2 ( efidev->device, "EFIDRV %p %s removed child",
-		efidev->device, efi_devpath_text ( efidev->path ) );
+		efidev->device, efi_handle_name ( efidev->device ) );
 	DBGC2 ( efidev->device, " %p %s\n",
-		device, efi_handle_devpath_text ( device ) );
+		device, efi_handle_name ( device ) );
 }
 
 /**
@@ -181,7 +180,7 @@ efi_driver_supported ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
 	int rc;
 
 	DBGCP ( device, "EFIDRV %p %s DRIVER_SUPPORTED",
-		device, efi_handle_devpath_text ( device ) );
+		device, efi_handle_name ( device ) );
 	if ( child )
 		DBGCP ( device, " (child %s)", efi_devpath_text ( child ) );
 	DBGCP ( device, "\n" );
@@ -189,7 +188,7 @@ efi_driver_supported ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
 	/* Do nothing if we are already driving this device */
 	if ( efidev_find ( device ) != NULL ) {
 		DBGCP ( device, "EFIDRV %p %s is already started\n",
-			device, efi_handle_devpath_text ( device ) );
+			device, efi_handle_name ( device ) );
 		return EFI_ALREADY_STARTED;
 	}
 
@@ -197,13 +196,13 @@ efi_driver_supported ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
 	for_each_table_entry ( efidrv, EFI_DRIVERS ) {
 		if ( ( rc = efidrv->supported ( device ) ) == 0 ) {
 			DBGC ( device, "EFIDRV %p %s has driver \"%s\"\n",
-			       device, efi_handle_devpath_text ( device ),
+			       device, efi_handle_name ( device ),
 			       efidrv->name );
 			return 0;
 		}
 	}
 	DBGCP ( device, "EFIDRV %p %s has no driver\n",
-		device, efi_handle_devpath_text ( device ) );
+		device, efi_handle_name ( device ) );
 
 	return EFI_UNSUPPORTED;
 }
@@ -230,7 +229,7 @@ efi_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
 	int rc;
 
 	DBGC ( device, "EFIDRV %p %s DRIVER_START",
-	       device, efi_handle_devpath_text ( device ) );
+	       device, efi_handle_name ( device ) );
 	if ( child )
 		DBGC ( device, " (child %s)", efi_devpath_text ( child ) );
 	DBGC ( device, "\n" );
@@ -239,7 +238,7 @@ efi_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
 	efidev = efidev_find ( device );
 	if ( efidev ) {
 		DBGCP ( device, "EFIDRV %p %s is already started\n",
-			device, efi_devpath_text ( efidev->path ) );
+			device, efi_handle_name ( device ) );
 		efirc = EFI_ALREADY_STARTED;
 		goto err_already_started;
 	}
@@ -263,7 +262,7 @@ efi_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
 					  EFI_OPEN_PROTOCOL_BY_DRIVER ) ) != 0){
 		rc = -EEFI ( efirc );
 		DBGC ( device, "EFIDRV %p %s could not open device path: %s\n",
-		       device, efi_handle_devpath_text ( device ),
+		       device, efi_handle_name ( device ),
 		       strerror ( rc ) );
 		goto err_no_device_path;
 	}
@@ -273,20 +272,20 @@ efi_driver_start ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
 	for_each_table_entry ( efidrv, EFI_DRIVERS ) {
 		if ( ( rc = efidrv->supported ( device ) ) != 0 ) {
 			DBGC ( device, "EFIDEV %p %s is not supported by "
-			       "driver \"%s\": %s\n",
-			       device, efi_devpath_text ( efidev->path ),
-			       efidrv->name, strerror ( rc ) );
+			       "driver \"%s\": %s\n", device,
+			       efi_handle_name ( device ), efidrv->name,
+			       strerror ( rc ) );
 			continue;
 		}
 		if ( ( rc = efidrv->start ( efidev ) ) == 0 ) {
 			efidev->driver = efidrv;
 			DBGC ( device, "EFIDRV %p %s using driver \"%s\"\n",
-			       device, efi_devpath_text ( efidev->path ),
+			       device, efi_handle_name ( device ),
 			       efidev->driver->name );
 			return 0;
 		}
 		DBGC ( device, "EFIDRV %p %s could not start driver \"%s\": "
-		       "%s\n", device, efi_devpath_text ( efidev->path ),
+		       "%s\n", device, efi_handle_name ( device ),
 		       efidrv->name, strerror ( rc ) );
 	}
 	efirc = EFI_UNSUPPORTED;
@@ -321,10 +320,10 @@ efi_driver_stop ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
 	UINTN i;
 
 	DBGC ( device, "EFIDRV %p %s DRIVER_STOP",
-	       device, efi_handle_devpath_text ( device ) );
+	       device, efi_handle_name ( device ) );
 	for ( i = 0 ; i < num_children ; i++ ) {
 		DBGC ( device, "%s%p %s", ( i ? ", " : " child " ),
-		       children[i], efi_handle_devpath_text ( children[i] ) );
+		       children[i], efi_handle_name ( children[i] ) );
 	}
 	DBGC ( device, "\n" );
 
@@ -332,7 +331,7 @@ efi_driver_stop ( EFI_DRIVER_BINDING_PROTOCOL *driver __unused,
 	efidev = efidev_find ( device );
 	if ( ! efidev ) {
 		DBGCP ( device, "EFIDRV %p %s is not started\n",
-			device, efi_devpath_text ( efidev->path ) );
+			device, efi_handle_name ( device ) );
 		return 0;
 	}
 
@@ -488,17 +487,17 @@ static int efi_driver_connect ( EFI_HANDLE device ) {
 
 	/* Disconnect any existing drivers */
 	DBGC ( device, "EFIDRV %p %s disconnecting existing drivers\n",
-	       device, efi_handle_devpath_text ( device ) );
+	       device, efi_handle_name ( device ) );
 	bs->DisconnectController ( device, NULL, NULL );
 
 	/* Connect our driver */
 	DBGC ( device, "EFIDRV %p %s connecting new drivers\n",
-	       device, efi_handle_devpath_text ( device ) );
+	       device, efi_handle_name ( device ) );
 	if ( ( efirc = bs->ConnectController ( device, drivers, NULL,
 					       FALSE ) ) != 0 ) {
 		rc = -EEFI ( efirc );
 		DBGC ( device, "EFIDRV %p %s could not connect new drivers: "
-		       "%s\n", device, efi_handle_devpath_text ( device ),
+		       "%s\n", device, efi_handle_name ( device ),
 		       strerror ( rc ) );
 		return rc;
 	}