Index: stand/efi/libefi/devicename.c
===================================================================
--- stand/efi/libefi/devicename.c
+++ stand/efi/libefi/devicename.c
@@ -175,26 +175,8 @@
 efi_fmtdev(void *vdev)
 {
 	struct devdesc *dev = (struct devdesc *)vdev;
-	static char buf[SPECNAMELEN + 1];
 
-	switch(dev->d_dev->dv_type) {
-	case DEVT_NONE:
-		strcpy(buf, "(no device)");
-		break;
-
-	case DEVT_DISK:
-		return (disk_fmtdev(vdev));
-
-#ifdef EFI_ZFS_BOOT
-	case DEVT_ZFS:
-		return (zfs_fmtdev(dev));
-#endif
-	default:
-		sprintf(buf, "%s%d:", dev->d_dev->dv_name, dev->d_unit);
-		break;
-	}
-
-	return (buf);
+	return (devformat(dev));
 }
 
 /*