More removing compatibility macros.

md5 still the same.

"Dave, stop.  I feel my mind slipping away." -- hal

1 files changed, 102 insertions, 102 deletions

diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 5eeaaa6..84e5a52 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -516,7 +516,7 @@ static struct umass_devdescr_t umass_devdescrs[] = {
 
 /* the per device structure */
 struct umass_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
+	device_t		sc_dev;		/* base device */
 	usbd_device_handle	sc_udev;	/* USB device */
 
 	struct cam_sim		*umass_sim;	/* SCSI Interface Module */
@@ -872,7 +872,7 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface,
 		break;
 	default:
 		DPRINTF(UDMASS_GEN, ("%s: Unsupported command protocol %d\n",
-			USBDEVNAME(sc->sc_dev), id->bInterfaceSubClass));
+			device_get_nameunit(sc->sc_dev), id->bInterfaceSubClass));
 		return(UMATCH_NONE);
 	}
 
@@ -889,7 +889,7 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface,
 		break;
 	default:
 		DPRINTF(UDMASS_GEN, ("%s: Unsupported wire protocol %d\n",
-			USBDEVNAME(sc->sc_dev), id->bInterfaceProtocol));
+			device_get_nameunit(sc->sc_dev), id->bInterfaceProtocol));
 		return(UMATCH_NONE);
 	}
 
@@ -935,7 +935,7 @@ USB_ATTACH(umass)
 
 	id = usbd_get_interface_descriptor(sc->iface);
 #ifdef USB_DEBUG
-	printf("%s: ", USBDEVNAME(sc->sc_dev));
+	printf("%s: ", device_get_nameunit(sc->sc_dev));
 	switch (sc->proto&UMASS_PROTO_COMMAND) {
 	case UMASS_PROTO_SCSI:
 		printf("SCSI");
@@ -985,7 +985,7 @@ USB_ATTACH(umass)
 		if (err) {
 			DPRINTF(UDMASS_USB, ("%s: could not switch to "
 				"Alt Interface %d\n",
-				USBDEVNAME(sc->sc_dev), 1));
+				device_get_nameunit(sc->sc_dev), 1));
 			umass_detach(self);
 			USB_ATTACH_ERROR_RETURN;
 		}
@@ -1006,7 +1006,7 @@ USB_ATTACH(umass)
 		ed = usbd_interface2endpoint_descriptor(sc->iface, i);
 		if (!ed) {
 			printf("%s: could not read endpoint descriptor\n",
-			       USBDEVNAME(sc->sc_dev));
+			       device_get_nameunit(sc->sc_dev));
 			USB_ATTACH_ERROR_RETURN;
 		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN
@@ -1022,7 +1022,7 @@ USB_ATTACH(umass)
 #ifdef USB_DEBUG
 			if (UGETW(ed->wMaxPacketSize) > 2) {
 				DPRINTF(UDMASS_CBI, ("%s: intr size is %d\n",
-					USBDEVNAME(sc->sc_dev),
+					device_get_nameunit(sc->sc_dev),
 					UGETW(ed->wMaxPacketSize)));
 			}
 #endif
@@ -1033,7 +1033,7 @@ USB_ATTACH(umass)
 	if (!sc->bulkin || !sc->bulkout
 	    || (sc->proto & UMASS_PROTO_CBI_I && !sc->intrin) ) {
 	    	DPRINTF(UDMASS_USB, ("%s: endpoint not found %d/%d/%d\n",
-			USBDEVNAME(sc->sc_dev),
+			device_get_nameunit(sc->sc_dev),
 			sc->bulkin, sc->bulkout, sc->intrin));
 		umass_detach(self);
 		USB_ATTACH_ERROR_RETURN;
@@ -1044,7 +1044,7 @@ USB_ATTACH(umass)
 				USBD_EXCLUSIVE_USE, &sc->bulkout_pipe);
 	if (err) {
 		DPRINTF(UDMASS_USB, ("%s: cannot open %d-out pipe (bulk)\n",
-			USBDEVNAME(sc->sc_dev), sc->bulkout));
+			device_get_nameunit(sc->sc_dev), sc->bulkout));
 		umass_detach(self);
 		USB_ATTACH_ERROR_RETURN;
 	}
@@ -1052,7 +1052,7 @@ USB_ATTACH(umass)
 				USBD_EXCLUSIVE_USE, &sc->bulkin_pipe);
 	if (err) {
 		DPRINTF(UDMASS_USB, ("%s: could not open %d-in pipe (bulk)\n",
-			USBDEVNAME(sc->sc_dev), sc->bulkin));
+			device_get_nameunit(sc->sc_dev), sc->bulkin));
 		umass_detach(self);
 		USB_ATTACH_ERROR_RETURN;
 	}
@@ -1072,7 +1072,7 @@ USB_ATTACH(umass)
 				USBD_EXCLUSIVE_USE, &sc->intrin_pipe);
 		if (err) {
 			DPRINTF(UDMASS_USB, ("%s: couldn't open %d-in (intr)\n",
-				USBDEVNAME(sc->sc_dev), sc->intrin));
+				device_get_nameunit(sc->sc_dev), sc->intrin));
 			umass_detach(self);
 			USB_ATTACH_ERROR_RETURN;
 		}
@@ -1086,7 +1086,7 @@ USB_ATTACH(umass)
 		sc->transfer_xfer[i] = usbd_alloc_xfer(uaa->device);
 		if (!sc->transfer_xfer[i]) {
 			DPRINTF(UDMASS_USB, ("%s: Out of memory\n",
-				USBDEVNAME(sc->sc_dev)));
+				device_get_nameunit(sc->sc_dev)));
 			umass_detach(self);
 			USB_ATTACH_ERROR_RETURN;
 		}
@@ -1162,7 +1162,7 @@ USB_ATTACH(umass)
 	}
 
 	sc->transfer_state = TSTATE_IDLE;
-	DPRINTF(UDMASS_GEN, ("%s: Attach finished\n", USBDEVNAME(sc->sc_dev)));
+	DPRINTF(UDMASS_GEN, ("%s: Attach finished\n", device_get_nameunit(sc->sc_dev)));
 
 	USB_ATTACH_SUCCESS_RETURN;
 }
@@ -1173,7 +1173,7 @@ USB_DETACH(umass)
 	int err = 0;
 	int i;
 
-	DPRINTF(UDMASS_USB, ("%s: detached\n", USBDEVNAME(sc->sc_dev)));
+	DPRINTF(UDMASS_USB, ("%s: detached\n", device_get_nameunit(sc->sc_dev)));
 
 	sc->flags |= UMASS_FLAGS_GONE;
 
@@ -1226,7 +1226,7 @@ umass_init_shuttle(struct umass_softc *sc)
 	(void) usbd_do_request(sc->sc_udev, &req, &status);
 
 	DPRINTF(UDMASS_GEN, ("%s: Shuttle init returned 0x%02x%02x\n",
-		USBDEVNAME(sc->sc_dev), status[0], status[1]));
+		device_get_nameunit(sc->sc_dev), status[0], status[1]));
 }
 
  /*
@@ -1248,7 +1248,7 @@ umass_setup_transfer(struct umass_softc *sc, usbd_pipe_handle pipe,
 	err = usbd_transfer(xfer);
 	if (err && err != USBD_IN_PROGRESS) {
 		DPRINTF(UDMASS_BBB, ("%s: failed to setup transfer, %s\n",
-			USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
+			device_get_nameunit(sc->sc_dev), usbd_errstr(err)));
 		return(err);
 	}
 
@@ -1272,7 +1272,7 @@ umass_setup_ctrl_transfer(struct umass_softc *sc, usbd_device_handle udev,
 	err = usbd_transfer(xfer);
 	if (err && err != USBD_IN_PROGRESS) {
 		DPRINTF(UDMASS_BBB, ("%s: failed to setup ctrl transfer, %s\n",
-			 USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
+			 device_get_nameunit(sc->sc_dev), usbd_errstr(err)));
 
 		/* do not reset, as this would make us loop */
 		return(err);
@@ -1289,7 +1289,7 @@ umass_clear_endpoint_stall(struct umass_softc *sc,
 	usbd_device_handle udev;
 
 	DPRINTF(UDMASS_BBB, ("%s: Clear endpoint 0x%02x stall\n",
-		USBDEVNAME(sc->sc_dev), endpt));
+		device_get_nameunit(sc->sc_dev), endpt));
 
 	usbd_interface2device_handle(sc->iface, &udev);
 
@@ -1326,7 +1326,7 @@ umass_bbb_reset(struct umass_softc *sc, int status)
 
 	KASSERT(sc->proto & UMASS_PROTO_BBB,
 		("%s: umass_bbb_reset: wrong sc->proto 0x%02x\n",
-			USBDEVNAME(sc->sc_dev), sc->proto));
+			device_get_nameunit(sc->sc_dev), sc->proto));
 
 	/*
 	 * Reset recovery (5.3.4 in Universal Serial Bus Mass Storage Class)
@@ -1345,7 +1345,7 @@ umass_bbb_reset(struct umass_softc *sc, int status)
 	 */
 
 	DPRINTF(UDMASS_BBB, ("%s: Bulk Reset\n",
-		USBDEVNAME(sc->sc_dev)));
+		device_get_nameunit(sc->sc_dev)));
 
 	sc->transfer_state = TSTATE_BBB_RESET1;
 	sc->transfer_status = status;
@@ -1369,7 +1369,7 @@ umass_bbb_transfer(struct umass_softc *sc, int lun, void *cmd, int cmdlen,
 {
 	KASSERT(sc->proto & UMASS_PROTO_BBB,
 		("%s: umass_bbb_transfer: wrong sc->proto 0x%02x\n",
-			USBDEVNAME(sc->sc_dev), sc->proto));
+			device_get_nameunit(sc->sc_dev), sc->proto));
 
 	/* Be a little generous. */
 	sc->timeout = timeout + UMASS_TIMEOUT;
@@ -1396,23 +1396,23 @@ umass_bbb_transfer(struct umass_softc *sc, int lun, void *cmd, int cmdlen,
 
 	/* check the given arguments */
 	KASSERT(datalen == 0 || data != NULL,
-		("%s: datalen > 0, but no buffer",USBDEVNAME(sc->sc_dev)));
+		("%s: datalen > 0, but no buffer",device_get_nameunit(sc->sc_dev)));
 	KASSERT(cmdlen <= CBWCDBLENGTH,
 		("%s: cmdlen exceeds CDB length in CBW (%d > %d)",
-			USBDEVNAME(sc->sc_dev), cmdlen, CBWCDBLENGTH));
+			device_get_nameunit(sc->sc_dev), cmdlen, CBWCDBLENGTH));
 	KASSERT(dir == DIR_NONE || datalen > 0,
 		("%s: datalen == 0 while direction is not NONE\n",
-			USBDEVNAME(sc->sc_dev)));
+			device_get_nameunit(sc->sc_dev)));
 	KASSERT(datalen == 0 || dir != DIR_NONE,
 		("%s: direction is NONE while datalen is not zero\n",
-			USBDEVNAME(sc->sc_dev)));
+			device_get_nameunit(sc->sc_dev)));
 	KASSERT(sizeof(umass_bbb_cbw_t) == UMASS_BBB_CBW_SIZE,
 		("%s: CBW struct does not have the right size (%ld vs. %d)\n",
-			USBDEVNAME(sc->sc_dev),
+			device_get_nameunit(sc->sc_dev),
 			(long)sizeof(umass_bbb_cbw_t), UMASS_BBB_CBW_SIZE));
 	KASSERT(sizeof(umass_bbb_csw_t) == UMASS_BBB_CSW_SIZE,
 		("%s: CSW struct does not have the right size (%ld vs. %d)\n",
-			USBDEVNAME(sc->sc_dev),
+			device_get_nameunit(sc->sc_dev),
 			(long)sizeof(umass_bbb_csw_t), UMASS_BBB_CSW_SIZE));
 
 	/*
@@ -1480,7 +1480,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 
 	KASSERT(sc->proto & UMASS_PROTO_BBB,
 		("%s: umass_bbb_state: wrong sc->proto 0x%02x\n",
-			USBDEVNAME(sc->sc_dev), sc->proto));
+			device_get_nameunit(sc->sc_dev), sc->proto));
 
 	/*
 	 * State handling for BBB transfers.
@@ -1494,7 +1494,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	 */
 
 	DPRINTF(UDMASS_BBB, ("%s: Handling BBB state %d (%s), xfer=%p, %s\n",
-		USBDEVNAME(sc->sc_dev), sc->transfer_state,
+		device_get_nameunit(sc->sc_dev), sc->transfer_state,
 		states[sc->transfer_state], xfer, usbd_errstr(err)));
 
 	/* Give up if the device has detached. */
@@ -1512,7 +1512,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 		/* Command transport phase, error handling */
 		if (err) {
 			DPRINTF(UDMASS_BBB, ("%s: failed to send CBW\n",
-				USBDEVNAME(sc->sc_dev)));
+				device_get_nameunit(sc->sc_dev)));
 			/* If the device detects that the CBW is invalid, then
 			 * the device may STALL both bulk endpoints and require
 			 * a Bulk-Reset
@@ -1541,7 +1541,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 			return;
 		} else {
 			DPRINTF(UDMASS_BBB, ("%s: no data phase\n",
-				USBDEVNAME(sc->sc_dev)));
+				device_get_nameunit(sc->sc_dev)));
 		}
 
 		/* FALLTHROUGH if no data phase, err == 0 */
@@ -1555,7 +1555,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 
 			if (err) {
 				DPRINTF(UDMASS_BBB, ("%s: Data-%s %db failed, "
-					"%s\n", USBDEVNAME(sc->sc_dev),
+					"%s\n", device_get_nameunit(sc->sc_dev),
 					(sc->transfer_dir == DIR_IN?"in":"out"),
 					sc->transfer_datalen,usbd_errstr(err)));
 
@@ -1596,7 +1596,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 		if (err) {	/* should not occur */
 			/* try the transfer below, even if clear stall failed */
 			DPRINTF(UDMASS_BBB, ("%s: bulk-%s stall clear failed"
-				", %s\n", USBDEVNAME(sc->sc_dev),
+				", %s\n", device_get_nameunit(sc->sc_dev),
 				(sc->transfer_dir == DIR_IN? "in":"out"),
 				usbd_errstr(err)));
 			umass_bbb_reset(sc, STATUS_WIRE_FAILED);
@@ -1632,7 +1632,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 		/* Status transfer, error handling */
 		if (err) {
 			DPRINTF(UDMASS_BBB, ("%s: Failed to read CSW, %s%s\n",
-				USBDEVNAME(sc->sc_dev), usbd_errstr(err),
+				device_get_nameunit(sc->sc_dev), usbd_errstr(err),
 				(sc->transfer_state == TSTATE_BBB_STATUS1?
 					", retrying":"")));
 
@@ -1673,7 +1673,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 			 * indicate that the device is confused -> reset it.
 			 */
 			printf("%s: Invalid CSW: sig 0x%08x should be 0x%08x\n",
-				USBDEVNAME(sc->sc_dev),
+				device_get_nameunit(sc->sc_dev),
 				UGETDW(sc->csw.dCSWSignature),
 				CSWSIGNATURE);
 
@@ -1682,7 +1682,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 		} else if (UGETDW(sc->csw.dCSWTag)
 				!= UGETDW(sc->cbw.dCBWTag)) {
 			printf("%s: Invalid CSW: tag %d should be %d\n",
-				USBDEVNAME(sc->sc_dev),
+				device_get_nameunit(sc->sc_dev),
 				UGETDW(sc->csw.dCSWTag),
 				UGETDW(sc->cbw.dCBWTag));
 
@@ -1692,7 +1692,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 		/* CSW is valid here */
 		} else if (sc->csw.bCSWStatus > CSWSTATUS_PHASE) {
 			printf("%s: Invalid CSW: status %d > %d\n",
-				USBDEVNAME(sc->sc_dev),
+				device_get_nameunit(sc->sc_dev),
 				sc->csw.bCSWStatus,
 				CSWSTATUS_PHASE);
 
@@ -1700,7 +1700,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 			return;
 		} else if (sc->csw.bCSWStatus == CSWSTATUS_PHASE) {
 			printf("%s: Phase Error, residue = %d\n",
-				USBDEVNAME(sc->sc_dev), Residue);
+				device_get_nameunit(sc->sc_dev), Residue);
 
 			umass_bbb_reset(sc, STATUS_WIRE_FAILED);
 			return;
@@ -1708,12 +1708,12 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 		} else if (sc->transfer_actlen > sc->transfer_datalen) {
 			/* Buffer overrun! Don't let this go by unnoticed */
 			panic("%s: transferred %db instead of %db",
-				USBDEVNAME(sc->sc_dev),
+				device_get_nameunit(sc->sc_dev),
 				sc->transfer_actlen, sc->transfer_datalen);
 
 		} else if (sc->csw.bCSWStatus == CSWSTATUS_FAILED) {
 			DPRINTF(UDMASS_BBB, ("%s: Command Failed, res = %d\n",
-				USBDEVNAME(sc->sc_dev), Residue));
+				device_get_nameunit(sc->sc_dev), Residue));
 
 			/* SCSI command failed but transfer was succesful */
 			sc->transfer_state = TSTATE_IDLE;
@@ -1733,7 +1733,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	case TSTATE_BBB_RESET1:
 		if (err)
 			printf("%s: BBB reset failed, %s\n",
-				USBDEVNAME(sc->sc_dev), usbd_errstr(err));
+				device_get_nameunit(sc->sc_dev), usbd_errstr(err));
 
 		umass_clear_endpoint_stall(sc,
 			sc->bulkin, sc->bulkin_pipe, TSTATE_BBB_RESET2,
@@ -1743,7 +1743,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	case TSTATE_BBB_RESET2:
 		if (err)	/* should not occur */
 			printf("%s: BBB bulk-in clear stall failed, %s\n",
-			       USBDEVNAME(sc->sc_dev), usbd_errstr(err));
+			       device_get_nameunit(sc->sc_dev), usbd_errstr(err));
 			/* no error recovery, otherwise we end up in a loop */
 
 		umass_clear_endpoint_stall(sc,
@@ -1754,7 +1754,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	case TSTATE_BBB_RESET3:
 		if (err)	/* should not occur */
 			printf("%s: BBB bulk-out clear stall failed, %s\n",
-			       USBDEVNAME(sc->sc_dev), usbd_errstr(err));
+			       device_get_nameunit(sc->sc_dev), usbd_errstr(err));
 			/* no error recovery, otherwise we end up in a loop */
 
 		sc->transfer_state = TSTATE_IDLE;
@@ -1769,7 +1769,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	/***** Default *****/
 	default:
 		panic("%s: Unknown state %d",
-		      USBDEVNAME(sc->sc_dev), sc->transfer_state);
+		      device_get_nameunit(sc->sc_dev), sc->transfer_state);
 	}
 }
 
@@ -1798,14 +1798,14 @@ umass_bbb_get_max_lun(struct umass_softc *sc)
 	case USBD_NORMAL_COMPLETION:
 		maxlun = buf;
 		DPRINTF(UDMASS_BBB, ("%s: Max Lun is %d\n",
-		    USBDEVNAME(sc->sc_dev), maxlun));
+		    device_get_nameunit(sc->sc_dev), maxlun));
 		break;
 	case USBD_STALLED:
 	case USBD_SHORT_XFER:
 	default:
 		/* Device doesn't support Get Max Lun request. */
 		printf("%s: Get Max Lun not supported (%s)\n",
-		    USBDEVNAME(sc->sc_dev), usbd_errstr(err));
+		    device_get_nameunit(sc->sc_dev), usbd_errstr(err));
 		/* XXX Should we port_reset the device? */
 		break;
 	}
@@ -1825,7 +1825,7 @@ umass_cbi_adsc(struct umass_softc *sc, char *buffer, int buflen,
 
 	KASSERT(sc->proto & (UMASS_PROTO_CBI|UMASS_PROTO_CBI_I),
 		("%s: umass_cbi_adsc: wrong sc->proto 0x%02x\n",
-			USBDEVNAME(sc->sc_dev), sc->proto));
+			device_get_nameunit(sc->sc_dev), sc->proto));
 
 	usbd_interface2device_handle(sc->iface, &udev);
 
@@ -1847,7 +1847,7 @@ umass_cbi_reset(struct umass_softc *sc, int status)
 
 	KASSERT(sc->proto & (UMASS_PROTO_CBI|UMASS_PROTO_CBI_I),
 		("%s: umass_cbi_reset: wrong sc->proto 0x%02x\n",
-			USBDEVNAME(sc->sc_dev), sc->proto));
+			device_get_nameunit(sc->sc_dev), sc->proto));
 
 	/*
 	 * Command Block Reset Protocol
@@ -1864,11 +1864,11 @@ umass_cbi_reset(struct umass_softc *sc, int status)
 	 */
 
 	DPRINTF(UDMASS_CBI, ("%s: CBI Reset\n",
-		USBDEVNAME(sc->sc_dev)));
+		device_get_nameunit(sc->sc_dev)));
 
 	KASSERT(sizeof(sc->cbl) >= SEND_DIAGNOSTIC_CMDLEN,
 		("%s: CBL struct is too small (%ld < %d)\n",
-			USBDEVNAME(sc->sc_dev),
+			device_get_nameunit(sc->sc_dev),
 			(long)sizeof(sc->cbl), SEND_DIAGNOSTIC_CMDLEN));
 
 	sc->transfer_state = TSTATE_CBI_RESET1;
@@ -1895,7 +1895,7 @@ umass_cbi_transfer(struct umass_softc *sc, int lun,
 {
 	KASSERT(sc->proto & (UMASS_PROTO_CBI|UMASS_PROTO_CBI_I),
 		("%s: umass_cbi_transfer: wrong sc->proto 0x%02x\n",
-			USBDEVNAME(sc->sc_dev), sc->proto));
+			device_get_nameunit(sc->sc_dev), sc->proto));
 
 	/* Be a little generous. */
 	sc->timeout = timeout + UMASS_TIMEOUT;
@@ -1919,10 +1919,10 @@ umass_cbi_transfer(struct umass_softc *sc, int lun,
 
 	/* check the given arguments */
 	KASSERT(datalen == 0 || data != NULL,
-		("%s: datalen > 0, but no buffer",USBDEVNAME(sc->sc_dev)));
+		("%s: datalen > 0, but no buffer",device_get_nameunit(sc->sc_dev)));
 	KASSERT(datalen == 0 || dir != DIR_NONE,
 		("%s: direction is NONE while datalen is not zero\n",
-			USBDEVNAME(sc->sc_dev)));
+			device_get_nameunit(sc->sc_dev)));
 
 	/* store the details for the data transfer phase */
 	sc->transfer_dir = dir;
@@ -1951,14 +1951,14 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 
 	KASSERT(sc->proto & (UMASS_PROTO_CBI|UMASS_PROTO_CBI_I),
 		("%s: umass_cbi_state: wrong sc->proto 0x%02x\n",
-			USBDEVNAME(sc->sc_dev), sc->proto));
+			device_get_nameunit(sc->sc_dev), sc->proto));
 
 	/*
 	 * State handling for CBI transfers.
 	 */
 
 	DPRINTF(UDMASS_CBI, ("%s: Handling CBI state %d (%s), xfer=%p, %s\n",
-		USBDEVNAME(sc->sc_dev), sc->transfer_state,
+		device_get_nameunit(sc->sc_dev), sc->transfer_state,
 		states[sc->transfer_state], xfer, usbd_errstr(err)));
 
 	/* Give up if the device has detached. */
@@ -1975,7 +1975,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	case TSTATE_CBI_COMMAND:
 		if (err == USBD_STALLED) {
 			DPRINTF(UDMASS_CBI, ("%s: Command Transport failed\n",
-				USBDEVNAME(sc->sc_dev)));
+				device_get_nameunit(sc->sc_dev)));
 			/* Status transport by control pipe (section 2.3.2.1).
 			 * The command contained in the command block failed.
 			 *
@@ -1993,7 +1993,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 			return;
 		} else if (err) {
 			DPRINTF(UDMASS_CBI, ("%s: failed to send ADSC\n",
-				USBDEVNAME(sc->sc_dev)));
+				device_get_nameunit(sc->sc_dev)));
 			umass_cbi_reset(sc, STATUS_WIRE_FAILED);
 
 			return;
@@ -2016,7 +2016,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 
 		} else if (sc->proto & UMASS_PROTO_CBI_I) {
 			DPRINTF(UDMASS_CBI, ("%s: no data phase\n",
-				USBDEVNAME(sc->sc_dev)));
+				device_get_nameunit(sc->sc_dev)));
 			sc->transfer_state = TSTATE_CBI_STATUS;
 			if (umass_setup_transfer(sc, sc->intrin_pipe,
 					&sc->sbl, sizeof(sc->sbl),
@@ -2026,7 +2026,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 			}
 		} else {
 			DPRINTF(UDMASS_CBI, ("%s: no data phase\n",
-				USBDEVNAME(sc->sc_dev)));
+				device_get_nameunit(sc->sc_dev)));
 			/* No command completion interrupt. Request
 			 * sense data.
 			 */
@@ -2043,7 +2043,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 
 		if (err) {
 			DPRINTF(UDMASS_CBI, ("%s: Data-%s %db failed, "
-				"%s\n", USBDEVNAME(sc->sc_dev),
+				"%s\n", device_get_nameunit(sc->sc_dev),
 				(sc->transfer_dir == DIR_IN?"in":"out"),
 				sc->transfer_datalen,usbd_errstr(err)));
 
@@ -2084,7 +2084,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	case TSTATE_CBI_STATUS:
 		if (err) {
 			DPRINTF(UDMASS_CBI, ("%s: Status Transport failed\n",
-				USBDEVNAME(sc->sc_dev)));
+				device_get_nameunit(sc->sc_dev)));
 			/* Status transport by interrupt pipe (section 2.3.2.2).
 			 */
 
@@ -2111,7 +2111,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 
 			DPRINTF(UDMASS_CBI, ("%s: UFI CCI, ASC = 0x%02x, "
 				"ASCQ = 0x%02x\n",
-				USBDEVNAME(sc->sc_dev),
+				device_get_nameunit(sc->sc_dev),
 				sc->sbl.ufi.asc, sc->sbl.ufi.ascq));
 
 			if (sc->sbl.ufi.asc == 0 && sc->sbl.ufi.ascq == 0)
@@ -2126,7 +2126,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 		} else {
 			/* Command Interrupt Data Block */
 			DPRINTF(UDMASS_CBI, ("%s: type=0x%02x, value=0x%02x\n",
-				USBDEVNAME(sc->sc_dev),
+				device_get_nameunit(sc->sc_dev),
 				sc->sbl.common.type, sc->sbl.common.value));
 
 			if (sc->sbl.common.type == IDB_TYPE_CCI) {
@@ -2155,7 +2155,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	case TSTATE_CBI_DCLEAR:
 		if (err) {	/* should not occur */
 			printf("%s: CBI bulk-in/out stall clear failed, %s\n",
-			       USBDEVNAME(sc->sc_dev), usbd_errstr(err));
+			       device_get_nameunit(sc->sc_dev), usbd_errstr(err));
 			umass_cbi_reset(sc, STATUS_WIRE_FAILED);
 		}
 
@@ -2168,7 +2168,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	case TSTATE_CBI_SCLEAR:
 		if (err)	/* should not occur */
 			printf("%s: CBI intr-in stall clear failed, %s\n",
-			       USBDEVNAME(sc->sc_dev), usbd_errstr(err));
+			       device_get_nameunit(sc->sc_dev), usbd_errstr(err));
 
 		/* Something really bad is going on. Reset the device */
 		umass_cbi_reset(sc, STATUS_CMD_FAILED);
@@ -2178,7 +2178,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	case TSTATE_CBI_RESET1:
 		if (err)
 			printf("%s: CBI reset failed, %s\n",
-				USBDEVNAME(sc->sc_dev), usbd_errstr(err));
+				device_get_nameunit(sc->sc_dev), usbd_errstr(err));
 
 		umass_clear_endpoint_stall(sc,
 			sc->bulkin, sc->bulkin_pipe, TSTATE_CBI_RESET2,
@@ -2188,7 +2188,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	case TSTATE_CBI_RESET2:
 		if (err)	/* should not occur */
 			printf("%s: CBI bulk-in stall clear failed, %s\n",
-			       USBDEVNAME(sc->sc_dev), usbd_errstr(err));
+			       device_get_nameunit(sc->sc_dev), usbd_errstr(err));
 			/* no error recovery, otherwise we end up in a loop */
 
 		umass_clear_endpoint_stall(sc,
@@ -2199,7 +2199,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	case TSTATE_CBI_RESET3:
 		if (err)	/* should not occur */
 			printf("%s: CBI bulk-out stall clear failed, %s\n",
-			       USBDEVNAME(sc->sc_dev), usbd_errstr(err));
+			       device_get_nameunit(sc->sc_dev), usbd_errstr(err));
 			/* no error recovery, otherwise we end up in a loop */
 
 		sc->transfer_state = TSTATE_IDLE;
@@ -2215,7 +2215,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
 	/***** Default *****/
 	default:
 		panic("%s: Unknown state %d",
-		      USBDEVNAME(sc->sc_dev), sc->transfer_state);
+		      device_get_nameunit(sc->sc_dev), sc->transfer_state);
 	}
 }
 
@@ -2244,7 +2244,7 @@ umass_cam_attach_sim(struct umass_softc *sc)
 	sc->umass_sim = cam_sim_alloc(umass_cam_action, umass_cam_poll,
 				DEVNAME_SIM,
 				sc /*priv*/,
-				USBDEVUNIT(sc->sc_dev) /*unit number*/,
+				device_get_unit(sc->sc_dev) /*unit number*/,
 				1 /*maximum device openings*/,
 				0 /*maximum tagged device openings*/,
 				devq);
@@ -2253,7 +2253,7 @@ umass_cam_attach_sim(struct umass_softc *sc)
 		return(ENOMEM);
 	}
 
-	if(xpt_bus_register(sc->umass_sim, USBDEVUNIT(sc->sc_dev)) !=
+	if(xpt_bus_register(sc->umass_sim, device_get_unit(sc->sc_dev)) !=
 	    CAM_SUCCESS)
 		return(ENOMEM);
 
@@ -2287,8 +2287,8 @@ umass_cam_rescan(void *addr)
 
 	DPRINTF(UDMASS_SCSI, ("scbus%d: scanning for %s:%d:%d:%d\n",
 		cam_sim_path(sc->umass_sim),
-		USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
-		USBDEVUNIT(sc->sc_dev), CAM_LUN_WILDCARD));
+		device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
+		device_get_unit(sc->sc_dev), CAM_LUN_WILDCARD));
 
 	ccb = malloc(sizeof(union ccb), M_USBDEV, M_NOWAIT | M_ZERO);
 	if (ccb == NULL)
@@ -2316,8 +2316,8 @@ umass_cam_attach(struct umass_softc *sc)
 	if (bootverbose)
 #endif
 		printf("%s:%d:%d:%d: Attached to scbus%d\n",
-			USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
-			USBDEVUNIT(sc->sc_dev), CAM_LUN_WILDCARD,
+			device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
+			device_get_unit(sc->sc_dev), CAM_LUN_WILDCARD,
 			cam_sim_path(sc->umass_sim));
 
 	if (!cold) {
@@ -2369,7 +2369,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 	if (sc && (sc->flags & UMASS_FLAGS_GONE)) {
 		DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:func_code 0x%04x: "
 			"Invalid target (gone)\n",
-			USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
+			device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
 			ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
 			ccb->ccb_h.func_code));
 		ccb->ccb_h.status = CAM_TID_INVALID;
@@ -2440,7 +2440,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 		DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_SCSI_IO: "
 			"cmd: 0x%02x, flags: 0x%02x, "
 			"%db cmd/%db data/%db sense\n",
-			USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
+			device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
 			ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
 			csio->cdb_io.cdb_bytes[0],
 			ccb->ccb_h.flags & CAM_DIR_MASK,
@@ -2458,7 +2458,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 		if (sc->transfer_state != TSTATE_IDLE) {
 			DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_SCSI_IO: "
 				"I/O in progress, deferring (state %d, %s)\n",
-				USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
+				device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
 				ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
 				sc->transfer_state,states[sc->transfer_state]));
 			ccb->ccb_h.status = CAM_SCSI_BUSY;
@@ -2549,7 +2549,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 		struct ccb_pathinq *cpi = &ccb->cpi;
 
 		DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_PATH_INQ:.\n",
-			(sc == NULL? DEVNAME_SIM:USBDEVNAME(sc->sc_dev)),
+			(sc == NULL? DEVNAME_SIM:device_get_nameunit(sc->sc_dev)),
 			cam_sim_path(sc->umass_sim),
 			ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
 
@@ -2565,7 +2565,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 		strncpy(cpi->hba_vid, "USB SCSI", HBA_IDLEN);
 		strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
 		cpi->unit_number = cam_sim_unit(sim);
-		cpi->bus_id = USBDEVUNIT(sc->sc_dev);
+		cpi->bus_id = device_get_unit(sc->sc_dev);
 
 		if (sc == NULL) {
 			cpi->base_transfer_speed = 0;
@@ -2592,7 +2592,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 	case XPT_RESET_DEV:
 	{
 		DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_RESET_DEV:.\n",
-			USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
+			device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
 			ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
 
 		ccb->ccb_h.status = CAM_REQ_INPROG;
@@ -2604,7 +2604,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 		struct ccb_trans_settings *cts = &ccb->cts;
 
 		DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_GET_TRAN_SETTINGS:.\n",
-			USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
+			device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
 			ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
 
 		cts->valid = 0;
@@ -2617,7 +2617,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 	case XPT_SET_TRAN_SETTINGS:
 	{
 		DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_SET_TRAN_SETTINGS:.\n",
-			USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
+			device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
 			ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
 
 		ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
@@ -2633,7 +2633,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 	case XPT_NOOP:
 	{
 		DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_NOOP:.\n",
-			(sc == NULL? DEVNAME_SIM:USBDEVNAME(sc->sc_dev)),
+			(sc == NULL? DEVNAME_SIM:device_get_nameunit(sc->sc_dev)),
 			cam_sim_path(sc->umass_sim),
 			ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
 
@@ -2644,7 +2644,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 	default:
 		DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:func_code 0x%04x: "
 			"Not implemented\n",
-			(sc == NULL? DEVNAME_SIM:USBDEVNAME(sc->sc_dev)),
+			(sc == NULL? DEVNAME_SIM:device_get_nameunit(sc->sc_dev)),
 			cam_sim_path(sc->umass_sim),
 			ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
 			ccb->ccb_h.func_code));
@@ -2661,7 +2661,7 @@ umass_cam_poll(struct cam_sim *sim)
 	struct umass_softc *sc = (struct umass_softc *) sim->softc;
 
 	DPRINTF(UDMASS_SCSI, ("%s: CAM poll\n",
-		USBDEVNAME(sc->sc_dev)));
+		device_get_nameunit(sc->sc_dev)));
 
 	usbd_set_polling(sc->sc_udev, 1);
 	usbd_dopoll(sc->iface);
@@ -2707,7 +2707,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status)
 			sc->cam_scsi_sense.length = csio->sense_len;
 
 			DPRINTF(UDMASS_SCSI,("%s: Fetching %db sense data\n",
-				USBDEVNAME(sc->sc_dev), csio->sense_len));
+				device_get_nameunit(sc->sc_dev), csio->sense_len));
 
 			rcmd = (unsigned char *) &sc->cam_scsi_command;
 			rcmdlen = sizeof(sc->cam_scsi_command);
@@ -2749,7 +2749,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status)
 		break;
 	default:
 		panic("%s: Unknown status %d in umass_cam_cb",
-			USBDEVNAME(sc->sc_dev), status);
+			device_get_nameunit(sc->sc_dev), status);
 	}
 }
 
@@ -2814,7 +2814,7 @@ umass_cam_sense_cb(struct umass_softc *sc, void *priv, int residue, int status)
 
 			DPRINTF(UDMASS_SCSI,("%s: Doing a sneaky"
 					     "TEST_UNIT_READY\n",
-				USBDEVNAME(sc->sc_dev)));
+				device_get_nameunit(sc->sc_dev)));
 
 			/* the rest of the command was filled in at attach */
 
@@ -2844,7 +2844,7 @@ umass_cam_sense_cb(struct umass_softc *sc, void *priv, int residue, int status)
 
 	default:
 		DPRINTF(UDMASS_SCSI, ("%s: Autosense failed, status %d\n",
-			USBDEVNAME(sc->sc_dev), status));
+			device_get_nameunit(sc->sc_dev), status));
 		ccb->ccb_h.status = CAM_AUTOSENSE_FAIL;
 		xpt_done(ccb);
 	}
@@ -2861,7 +2861,7 @@ umass_cam_quirk_cb(struct umass_softc *sc, void *priv, int residue, int status)
 	union ccb *ccb = (union ccb *) priv;
 
 	DPRINTF(UDMASS_SCSI, ("%s: Test unit ready returned status %d\n",
-	USBDEVNAME(sc->sc_dev), status));
+	device_get_nameunit(sc->sc_dev), status));
 
 	if (sc->flags & UMASS_FLAGS_GONE) {
 		ccb->ccb_h.status = CAM_TID_INVALID;
@@ -2904,7 +2904,7 @@ umass_scsi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
 				 *rcmdlen,
 				 (long)sizeof(struct scsi_start_stop_unit)));
 			DPRINTF(UDMASS_SCSI, ("%s: Converted TEST_UNIT_READY "
-				"to START_UNIT\n", USBDEVNAME(sc->sc_dev)));
+				"to START_UNIT\n", device_get_nameunit(sc->sc_dev)));
 			memset(*rcmd, 0, *rcmdlen);
 			(*rcmd)[0] = START_STOP_UNIT;
 			(*rcmd)[4] = SSS_START;
@@ -2962,7 +2962,7 @@ umass_rbc_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
 	/* All other commands are not legal in RBC */
 	default:
 		printf("%s: Unsupported RBC command 0x%02x",
-			USBDEVNAME(sc->sc_dev), cmd[0]);
+			device_get_nameunit(sc->sc_dev), cmd[0]);
 		printf("\n");
 		return 0;	/* failure */
 	}
@@ -2993,7 +2993,7 @@ umass_ufi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
 			 * Start Stop Unit should give the same results
 			 */
 			DPRINTF(UDMASS_UFI, ("%s: Converted TEST_UNIT_READY "
-				"to START_UNIT\n", USBDEVNAME(sc->sc_dev)));
+				"to START_UNIT\n", device_get_nameunit(sc->sc_dev)));
 			(*rcmd)[0] = START_STOP_UNIT;
 			(*rcmd)[4] = SSS_START;
 		} else {
@@ -3024,7 +3024,7 @@ umass_ufi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
 
 	default:
 		printf("%s: Unsupported UFI command 0x%02x\n",
-			USBDEVNAME(sc->sc_dev), cmd[0]);
+			device_get_nameunit(sc->sc_dev), cmd[0]);
 		return 0;	/* failure */
 	}
 }
@@ -3062,7 +3062,7 @@ umass_atapi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
 				 *rcmdlen,
 				 (long)sizeof(struct scsi_start_stop_unit)));
 			DPRINTF(UDMASS_SCSI, ("%s: Converted TEST_UNIT_READY "
-				"to START_UNIT\n", USBDEVNAME(sc->sc_dev)));
+				"to START_UNIT\n", device_get_nameunit(sc->sc_dev)));
 			memset(*rcmd, 0, *rcmdlen);
 			(*rcmd)[0] = START_STOP_UNIT;
 			(*rcmd)[4] = SSS_START;
@@ -3110,7 +3110,7 @@ umass_atapi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
 	default:
 		printf("%s: Unsupported ATAPI command 0x%02x"
 			" - trying anyway\n",
-			USBDEVNAME(sc->sc_dev), cmd[0]);
+			device_get_nameunit(sc->sc_dev), cmd[0]);
 		memcpy(*rcmd, cmd, cmdlen);
 		return 1;
 	}
@@ -3136,7 +3136,7 @@ umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw)
 	DPRINTF(UDMASS_BBB, ("%s: CBW %d: cmd = %db "
 		"(0x%02x%02x%02x%02x%02x%02x%s), "
 		"data = %db, dir = %s\n",
-		USBDEVNAME(sc->sc_dev), tag, clen,
+		device_get_nameunit(sc->sc_dev), tag, clen,
 		c[0], c[1], c[2], c[3], c[4], c[5], (clen > 6? "...":""),
 		dlen, (flags == CBWFLAGS_IN? "in":
 		       (flags == CBWFLAGS_OUT? "out":"<invalid>"))));
@@ -3151,7 +3151,7 @@ umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw)
 	int status = csw->bCSWStatus;
 
 	DPRINTF(UDMASS_BBB, ("%s: CSW %d: sig = 0x%08x (%s), tag = %d, "
-		"res = %d, status = 0x%02x (%s)\n", USBDEVNAME(sc->sc_dev),
+		"res = %d, status = 0x%02x (%s)\n", device_get_nameunit(sc->sc_dev),
 		tag, sig, (sig == CSWSIGNATURE?  "valid":"invalid"),
 		tag, res,
 		status, (status == CSWSTATUS_GOOD? "good":
@@ -3168,7 +3168,7 @@ umass_cbi_dump_cmd(struct umass_softc *sc, void *cmd, int cmdlen)
 	DPRINTF(UDMASS_BBB, ("%s: cmd = %db "
 		"(0x%02x%02x%02x%02x%02x%02x%s), "
 		"data = %db, dir = %s\n",
-		USBDEVNAME(sc->sc_dev), cmdlen,
+		device_get_nameunit(sc->sc_dev), cmdlen,
 		c[0], c[1], c[2], c[3], c[4], c[5], (cmdlen > 6? "...":""),
 		sc->transfer_datalen,
 		(dir == DIR_IN? "in":
@@ -3193,7 +3193,7 @@ umass_dump_buffer(struct umass_softc *sc, u_int8_t *buffer, int buflen,
 		j = i % 16;
 		if (j == 0 && i != 0) {
 			DPRINTF(UDMASS_GEN, ("%s: 0x %s%s\n",
-				USBDEVNAME(sc->sc_dev), s1, s2));
+				device_get_nameunit(sc->sc_dev), s1, s2));
 			s2[0] = '\0';
 		}
 		sprintf(&s1[j*2], "%02x", buffer[i] & 0xff);
@@ -3201,6 +3201,6 @@ umass_dump_buffer(struct umass_softc *sc, u_int8_t *buffer, int buflen,
 	if (buflen > printlen)
 		sprintf(s3, " ...");
 	DPRINTF(UDMASS_GEN, ("%s: 0x %s%s%s\n",
-		USBDEVNAME(sc->sc_dev), s1, s2, s3));
+		device_get_nameunit(sc->sc_dev), s1, s2, s3));
 }
 #endif