Remove the definition and use of the USBDEVNAME macro.

(This might look easy, but it was a big diff.  Thanks to dlg and especially jsg
for looking over it; we found at least four mistakes in the initial diff.)

ok jsg.

1 files changed, 65 insertions, 65 deletions

diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 9259644bbc5..3787a7c5e94 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_aue.c,v 1.60 2007/06/10 10:53:48 mbalmer Exp $ */
+/*	$OpenBSD: if_aue.c,v 1.61 2007/06/10 14:49:00 mbalmer Exp $ */
 /*	$NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -276,7 +276,7 @@ aue_csr_read_1(struct aue_softc *sc, int reg)
 
 	if (err) {
 		DPRINTF(("%s: aue_csr_read_1: reg=0x%x err=%s\n",
-			 USBDEVNAME(sc->aue_dev), reg, usbd_errstr(err)));
+			 sc->aue_dev.dv_xname, reg, usbd_errstr(err)));
 		return (0);
 	}
 
@@ -303,7 +303,7 @@ aue_csr_read_2(struct aue_softc *sc, int reg)
 
 	if (err) {
 		DPRINTF(("%s: aue_csr_read_2: reg=0x%x err=%s\n",
-			 USBDEVNAME(sc->aue_dev), reg, usbd_errstr(err)));
+			 sc->aue_dev.dv_xname, reg, usbd_errstr(err)));
 		return (0);
 	}
 
@@ -331,7 +331,7 @@ aue_csr_write_1(struct aue_softc *sc, int reg, int aval)
 
 	if (err) {
 		DPRINTF(("%s: aue_csr_write_1: reg=0x%x err=%s\n",
-			 USBDEVNAME(sc->aue_dev), reg, usbd_errstr(err)));
+			 sc->aue_dev.dv_xname, reg, usbd_errstr(err)));
 		return (-1);
 	}
 
@@ -359,7 +359,7 @@ aue_csr_write_2(struct aue_softc *sc, int reg, int aval)
 
 	if (err) {
 		DPRINTF(("%s: aue_csr_write_2: reg=0x%x err=%s\n",
-			 USBDEVNAME(sc->aue_dev), reg, usbd_errstr(err)));
+			 sc->aue_dev.dv_xname, reg, usbd_errstr(err)));
 		return (-1);
 	}
 
@@ -384,7 +384,7 @@ aue_eeprom_getword(struct aue_softc *sc, int addr)
 
 	if (i == AUE_TIMEOUT) {
 		printf("%s: EEPROM read timed out\n",
-		    USBDEVNAME(sc->aue_dev));
+		    sc->aue_dev.dv_xname);
 	}
 
 	return (aue_csr_read_2(sc, AUE_EE_DATA));
@@ -400,7 +400,7 @@ aue_read_mac(struct aue_softc *sc, u_char *dest)
 	int			off = 0;
 	int			word;
 
-	DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(5,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	for (i = 0; i < 3; i++) {
 		word = aue_eeprom_getword(sc, off + i);
@@ -434,7 +434,7 @@ aue_miibus_readreg(device_ptr_t dev, int phy, int reg)
 
 	if (sc->aue_dying) {
 #ifdef DIAGNOSTIC
-		printf("%s: dying\n", USBDEVNAME(sc->aue_dev));
+		printf("%s: dying\n", sc->aue_dev.dv_xname);
 #endif
 		return 0;
 	}
@@ -467,13 +467,13 @@ aue_miibus_readreg(device_ptr_t dev, int phy, int reg)
 	}
 
 	if (i == AUE_TIMEOUT) {
-		printf("%s: MII read timed out\n", USBDEVNAME(sc->aue_dev));
+		printf("%s: MII read timed out\n", sc->aue_dev.dv_xname);
 	}
 
 	val = aue_csr_read_2(sc, AUE_PHY_DATA);
 
 	DPRINTFN(11,("%s: %s: phy=%d reg=%d => 0x%04x\n",
-		     USBDEVNAME(sc->aue_dev), __func__, phy, reg, val));
+		     sc->aue_dev.dv_xname, __func__, phy, reg, val));
 
 	aue_unlock_mii(sc);
 	return (val);
@@ -494,7 +494,7 @@ aue_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
 #endif
 
 	DPRINTFN(11,("%s: %s: phy=%d reg=%d data=0x%04x\n",
-		     USBDEVNAME(sc->aue_dev), __func__, phy, reg, data));
+		     sc->aue_dev.dv_xname, __func__, phy, reg, data));
 
 	aue_lock_mii(sc);
 	aue_csr_write_2(sc, AUE_PHY_DATA, data);
@@ -508,7 +508,7 @@ aue_miibus_writereg(device_ptr_t dev, int phy, int reg, int data)
 
 	if (i == AUE_TIMEOUT) {
 		printf("%s: MII read timed out\n",
-		    USBDEVNAME(sc->aue_dev));
+		    sc->aue_dev.dv_xname);
 	}
 	aue_unlock_mii(sc);
 }
@@ -519,7 +519,7 @@ aue_miibus_statchg(device_ptr_t dev)
 	struct aue_softc	*sc = USBGETSOFTC(dev);
 	struct mii_data		*mii = GET_MII(sc);
 
-	DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(5,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	aue_lock_mii(sc);
 	AUE_CLRBIT(sc, AUE_CTL0, AUE_CTL0_RX_ENB | AUE_CTL0_TX_ENB);
@@ -548,7 +548,7 @@ aue_miibus_statchg(device_ptr_t dev)
 		auxmode = aue_miibus_readreg(dev, 0, 0x1b);
 		aue_miibus_writereg(dev, 0, 0x1b, auxmode | 0x04);
 	}
-	DPRINTFN(5,("%s: %s: exit\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(5,("%s: %s: exit\n", sc->aue_dev.dv_xname, __func__));
 }
 
 #define AUE_POLY	0xEDB88320
@@ -578,7 +578,7 @@ aue_setmulti(struct aue_softc *sc)
 	struct ether_multistep	step;
 	u_int32_t		h = 0, i;
 
-	DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(5,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	ifp = GET_IFP(sc);
 
@@ -629,7 +629,7 @@ aue_reset(struct aue_softc *sc)
 {
 	int		i;
 
-	DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(2,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	AUE_SETBIT(sc, AUE_CTL1, AUE_CTL1_RESETMAC);
 
@@ -639,7 +639,7 @@ aue_reset(struct aue_softc *sc)
 	}
 
 	if (i == AUE_TIMEOUT)
-		printf("%s: reset failed\n", USBDEVNAME(sc->aue_dev));
+		printf("%s: reset failed\n", sc->aue_dev.dv_xname);
 
 #if 0
 	/* XXX what is mii_mode supposed to be */
@@ -715,13 +715,13 @@ aue_attach(struct device *parent, struct device *self, void *aux)
 	DPRINTFN(5,(" : aue_attach: sc=%p", sc));
 
 	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", USBDEVNAME(sc->aue_dev), devinfop);
+	printf("\n%s: %s\n", sc->aue_dev.dv_xname, devinfop);
 	usbd_devinfo_free(devinfop);
 
 	err = usbd_set_config_no(dev, AUE_CONFIG_NO, 1);
 	if (err) {
 		printf("%s: setting config no failed\n",
-		    USBDEVNAME(sc->aue_dev));
+		    sc->aue_dev.dv_xname);
 		return;
 	}
 
@@ -732,7 +732,7 @@ aue_attach(struct device *parent, struct device *self, void *aux)
 	err = usbd_device2interface_handle(dev, AUE_IFACE_IDX, &iface);
 	if (err) {
 		printf("%s: getting interface handle failed\n",
-		    USBDEVNAME(sc->aue_dev));
+		    sc->aue_dev.dv_xname);
 		return;
 	}
 
@@ -750,7 +750,7 @@ aue_attach(struct device *parent, struct device *self, void *aux)
 		ed = usbd_interface2endpoint_descriptor(iface, i);
 		if (ed == NULL) {
 			printf("%s: couldn't get endpoint descriptor %d\n",
-			    USBDEVNAME(sc->aue_dev), i);
+			    sc->aue_dev.dv_xname, i);
 			return;
 		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
@@ -767,7 +767,7 @@ aue_attach(struct device *parent, struct device *self, void *aux)
 
 	if (sc->aue_ed[AUE_ENDPT_RX] == 0 || sc->aue_ed[AUE_ENDPT_TX] == 0 ||
 	    sc->aue_ed[AUE_ENDPT_INTR] == 0) {
-		printf("%s: missing endpoint\n", USBDEVNAME(sc->aue_dev));
+		printf("%s: missing endpoint\n", sc->aue_dev.dv_xname);
 		return;
 	}
 
@@ -786,7 +786,7 @@ aue_attach(struct device *parent, struct device *self, void *aux)
 	 * A Pegasus chip was detected. Inform the world.
 	 */
 	ifp = GET_IFP(sc);
-	printf("%s: address %s\n", USBDEVNAME(sc->aue_dev),
+	printf("%s: address %s\n", sc->aue_dev.dv_xname,
 	    ether_sprintf(eaddr));
 
 	bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
@@ -797,7 +797,7 @@ aue_attach(struct device *parent, struct device *self, void *aux)
 	ifp->if_ioctl = aue_ioctl;
 	ifp->if_start = aue_start;
 	ifp->if_watchdog = aue_watchdog;
-	strlcpy(ifp->if_xname, USBDEVNAME(sc->aue_dev), IFNAMSIZ);
+	strlcpy(ifp->if_xname, sc->aue_dev.dv_xname, IFNAMSIZ);
 
 	IFQ_SET_READY(&ifp->if_snd);
 
@@ -837,7 +837,7 @@ aue_detach(struct device *self, int flags)
 	struct ifnet		*ifp = GET_IFP(sc);
 	int			s;
 
-	DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(2,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	if (!sc->aue_attached) {
 		/* Detached before attached finished, so just bail out. */
@@ -867,7 +867,7 @@ aue_detach(struct device *self, int flags)
 	    sc->aue_ep[AUE_ENDPT_RX] != NULL ||
 	    sc->aue_ep[AUE_ENDPT_INTR] != NULL)
 		printf("%s: detach has active endpoints\n",
-		       USBDEVNAME(sc->aue_dev));
+		       sc->aue_dev.dv_xname);
 #endif
 
 	sc->aue_attached = 0;
@@ -891,7 +891,7 @@ aue_activate(device_ptr_t self, enum devact act)
 {
 	struct aue_softc *sc = (struct aue_softc *)self;
 
-	DPRINTFN(2,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(2,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	switch (act) {
 	case DVACT_ACTIVATE:
@@ -912,20 +912,20 @@ aue_newbuf(struct aue_softc *sc, struct aue_chain *c, struct mbuf *m)
 {
 	struct mbuf		*m_new = NULL;
 
-	DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
+	DPRINTFN(10,("%s: %s: enter\n", sc->aue_dev.dv_xname,__func__));
 
 	if (m == NULL) {
 		MGETHDR(m_new, M_DONTWAIT, MT_DATA);
 		if (m_new == NULL) {
 			printf("%s: no memory for rx list "
-			    "-- packet dropped!\n", USBDEVNAME(sc->aue_dev));
+			    "-- packet dropped!\n", sc->aue_dev.dv_xname);
 			return (ENOBUFS);
 		}
 
 		MCLGET(m_new, M_DONTWAIT);
 		if (!(m_new->m_flags & M_EXT)) {
 			printf("%s: no memory for rx list "
-			    "-- packet dropped!\n", USBDEVNAME(sc->aue_dev));
+			    "-- packet dropped!\n", sc->aue_dev.dv_xname);
 			m_freem(m_new);
 			return (ENOBUFS);
 		}
@@ -949,7 +949,7 @@ aue_rx_list_init(struct aue_softc *sc)
 	struct aue_chain	*c;
 	int			i;
 
-	DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(5,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	cd = &sc->aue_cdata;
 	for (i = 0; i < AUE_RX_LIST_CNT; i++) {
@@ -978,7 +978,7 @@ aue_tx_list_init(struct aue_softc *sc)
 	struct aue_chain	*c;
 	int			i;
 
-	DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(5,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	cd = &sc->aue_cdata;
 	for (i = 0; i < AUE_TX_LIST_CNT; i++) {
@@ -1006,7 +1006,7 @@ aue_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 	struct ifnet		*ifp = GET_IFP(sc);
 	struct aue_intrpkt	*p = &sc->aue_cdata.aue_ibuf;
 
-	DPRINTFN(15,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
+	DPRINTFN(15,("%s: %s: enter\n", sc->aue_dev.dv_xname,__func__));
 
 	if (sc->aue_dying)
 		return;
@@ -1021,7 +1021,7 @@ aue_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 		sc->aue_intr_errs++;
 		if (usbd_ratecheck(&sc->aue_rx_notice)) {
 			printf("%s: %u usb errors on intr: %s\n",
-			    USBDEVNAME(sc->aue_dev), sc->aue_intr_errs,
+			    sc->aue_dev.dv_xname, sc->aue_intr_errs,
 			    usbd_errstr(status));
 			sc->aue_intr_errs = 0;
 		}
@@ -1052,7 +1052,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 	struct aue_rxpkt	r;
 	int			s;
 
-	DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
+	DPRINTFN(10,("%s: %s: enter\n", sc->aue_dev.dv_xname,__func__));
 
 	if (sc->aue_dying)
 		return;
@@ -1066,7 +1066,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 		sc->aue_rx_errs++;
 		if (usbd_ratecheck(&sc->aue_rx_notice)) {
 			printf("%s: %u usb errors on rx: %s\n",
-			    USBDEVNAME(sc->aue_dev), sc->aue_rx_errs,
+			    sc->aue_dev.dv_xname, sc->aue_rx_errs,
 			    usbd_errstr(status));
 			sc->aue_rx_errs = 0;
 		}
@@ -1120,7 +1120,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 		bpf_mtap(ifp->if_bpf, m, BPF_DIRECTION_IN);
 #endif
 
-	DPRINTFN(10,("%s: %s: deliver %d\n", USBDEVNAME(sc->aue_dev),
+	DPRINTFN(10,("%s: %s: deliver %d\n", sc->aue_dev.dv_xname,
 		    __func__, m->m_len));
 	IF_INPUT(ifp, m);
  done1:
@@ -1135,7 +1135,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 	    USBD_NO_TIMEOUT, aue_rxeof);
 	usbd_transfer(xfer);
 
-	DPRINTFN(10,("%s: %s: start rx\n", USBDEVNAME(sc->aue_dev),
+	DPRINTFN(10,("%s: %s: start rx\n", sc->aue_dev.dv_xname,
 		    __func__));
 }
 
@@ -1157,7 +1157,7 @@ aue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 
 	s = splnet();
 
-	DPRINTFN(10,("%s: %s: enter status=%d\n", USBDEVNAME(sc->aue_dev),
+	DPRINTFN(10,("%s: %s: enter status=%d\n", sc->aue_dev.dv_xname,
 		    __func__, status));
 
 	ifp->if_timer = 0;
@@ -1169,7 +1169,7 @@ aue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
 			return;
 		}
 		ifp->if_oerrors++;
-		printf("%s: usb error on tx: %s\n", USBDEVNAME(sc->aue_dev),
+		printf("%s: usb error on tx: %s\n", sc->aue_dev.dv_xname,
 		    usbd_errstr(status));
 		if (status == USBD_STALLED)
 			usbd_clear_endpoint_stall_async(sc->aue_ep[AUE_ENDPT_TX]);
@@ -1193,7 +1193,7 @@ aue_tick(void *xsc)
 {
 	struct aue_softc	*sc = xsc;
 
-	DPRINTFN(15,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
+	DPRINTFN(15,("%s: %s: enter\n", sc->aue_dev.dv_xname,__func__));
 
 	if (sc == NULL)
 		return;
@@ -1213,7 +1213,7 @@ aue_tick_task(void *xsc)
 	struct mii_data		*mii;
 	int			s;
 
-	DPRINTFN(15,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
+	DPRINTFN(15,("%s: %s: enter\n", sc->aue_dev.dv_xname,__func__));
 
 	if (sc->aue_dying)
 		return;
@@ -1229,7 +1229,7 @@ aue_tick_task(void *xsc)
 	if (!sc->aue_link && mii->mii_media_status & IFM_ACTIVE &&
 	    IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
 		DPRINTFN(2,("%s: %s: got link\n",
-			    USBDEVNAME(sc->aue_dev),__func__));
+			    sc->aue_dev.dv_xname,__func__));
 		sc->aue_link++;
 		if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
 			aue_start(ifp);
@@ -1249,7 +1249,7 @@ aue_send(struct aue_softc *sc, struct mbuf *m, int idx)
 	struct aue_chain	*c;
 	usbd_status		err;
 
-	DPRINTFN(10,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev),__func__));
+	DPRINTFN(10,("%s: %s: enter\n", sc->aue_dev.dv_xname,__func__));
 
 	c = &sc->aue_cdata.aue_tx_chain[idx];
 
@@ -1277,13 +1277,13 @@ aue_send(struct aue_softc *sc, struct mbuf *m, int idx)
 	/* Transmit */
 	err = usbd_transfer(c->aue_xfer);
 	if (err != USBD_IN_PROGRESS) {
-		printf("%s: aue_send error=%s\n", USBDEVNAME(sc->aue_dev),
+		printf("%s: aue_send error=%s\n", sc->aue_dev.dv_xname,
 		       usbd_errstr(err));
 		/* Stop the interface from process context. */
 		usb_add_task(sc->aue_udev, &sc->aue_stop_task);
 		return (EIO);
 	}
-	DPRINTFN(5,("%s: %s: send %d bytes\n", USBDEVNAME(sc->aue_dev),
+	DPRINTFN(5,("%s: %s: send %d bytes\n", sc->aue_dev.dv_xname,
 		    __func__, total_len));
 
 	sc->aue_cdata.aue_tx_cnt++;
@@ -1297,7 +1297,7 @@ aue_start(struct ifnet *ifp)
 	struct aue_softc	*sc = ifp->if_softc;
 	struct mbuf		*m_head = NULL;
 
-	DPRINTFN(5,("%s: %s: enter, link=%d\n", USBDEVNAME(sc->aue_dev),
+	DPRINTFN(5,("%s: %s: enter, link=%d\n", sc->aue_dev.dv_xname,
 		    __func__, sc->aue_link));
 
 	if (sc->aue_dying)
@@ -1346,7 +1346,7 @@ aue_init(void *xsc)
 	int			i, s;
 	u_char			*eaddr;
 
-	DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(5,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	if (sc->aue_dying)
 		return;
@@ -1373,14 +1373,14 @@ aue_init(void *xsc)
 
 	/* Init TX ring. */
 	if (aue_tx_list_init(sc) == ENOBUFS) {
-		printf("%s: tx list init failed\n", USBDEVNAME(sc->aue_dev));
+		printf("%s: tx list init failed\n", sc->aue_dev.dv_xname);
 		splx(s);
 		return;
 	}
 
 	/* Init RX ring. */
 	if (aue_rx_list_init(sc) == ENOBUFS) {
-		printf("%s: rx list init failed\n", USBDEVNAME(sc->aue_dev));
+		printf("%s: rx list init failed\n", sc->aue_dev.dv_xname);
 		splx(s);
 		return;
 	}
@@ -1424,14 +1424,14 @@ aue_openpipes(struct aue_softc *sc)
 	    USBD_EXCLUSIVE_USE, &sc->aue_ep[AUE_ENDPT_RX]);
 	if (err) {
 		printf("%s: open rx pipe failed: %s\n",
-		    USBDEVNAME(sc->aue_dev), usbd_errstr(err));
+		    sc->aue_dev.dv_xname, usbd_errstr(err));
 		return (EIO);
 	}
 	err = usbd_open_pipe(sc->aue_iface, sc->aue_ed[AUE_ENDPT_TX],
 	    USBD_EXCLUSIVE_USE, &sc->aue_ep[AUE_ENDPT_TX]);
 	if (err) {
 		printf("%s: open tx pipe failed: %s\n",
-		    USBDEVNAME(sc->aue_dev), usbd_errstr(err));
+		    sc->aue_dev.dv_xname, usbd_errstr(err));
 		return (EIO);
 	}
 	err = usbd_open_pipe_intr(sc->aue_iface, sc->aue_ed[AUE_ENDPT_INTR],
@@ -1440,7 +1440,7 @@ aue_openpipes(struct aue_softc *sc)
 	    AUE_INTR_INTERVAL);
 	if (err) {
 		printf("%s: open intr pipe failed: %s\n",
-		    USBDEVNAME(sc->aue_dev), usbd_errstr(err));
+		    sc->aue_dev.dv_xname, usbd_errstr(err));
 		return (EIO);
 	}
 
@@ -1452,7 +1452,7 @@ aue_openpipes(struct aue_softc *sc)
 		    USBD_SHORT_XFER_OK | USBD_NO_COPY, USBD_NO_TIMEOUT,
 		    aue_rxeof);
 		(void)usbd_transfer(c->aue_xfer); /* XXX */
-		DPRINTFN(5,("%s: %s: start read\n", USBDEVNAME(sc->aue_dev),
+		DPRINTFN(5,("%s: %s: start read\n", sc->aue_dev.dv_xname,
 			    __func__));
 
 	}
@@ -1468,7 +1468,7 @@ aue_ifmedia_upd(struct ifnet *ifp)
 	struct aue_softc	*sc = ifp->if_softc;
 	struct mii_data		*mii = GET_MII(sc);
 
-	DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(5,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	if (sc->aue_dying)
 		return (0);
@@ -1494,7 +1494,7 @@ aue_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
 	struct aue_softc	*sc = ifp->if_softc;
 	struct mii_data		*mii = GET_MII(sc);
 
-	DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(5,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	mii_pollstat(mii);
 	ifmr->ifm_active = mii->mii_media_active;
@@ -1590,10 +1590,10 @@ aue_watchdog(struct ifnet *ifp)
 	usbd_status		stat;
 	int			s;
 
-	DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(5,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	ifp->if_oerrors++;
-	printf("%s: watchdog timeout\n", USBDEVNAME(sc->aue_dev));
+	printf("%s: watchdog timeout\n", sc->aue_dev.dv_xname);
 
 	s = splusb();
 	c = &sc->aue_cdata.aue_tx_chain[0];
@@ -1629,7 +1629,7 @@ aue_stop(struct aue_softc *sc)
 	struct ifnet		*ifp;
 	int			i;
 
-	DPRINTFN(5,("%s: %s: enter\n", USBDEVNAME(sc->aue_dev), __func__));
+	DPRINTFN(5,("%s: %s: enter\n", sc->aue_dev.dv_xname, __func__));
 
 	ifp = GET_IFP(sc);
 	ifp->if_timer = 0;
@@ -1645,12 +1645,12 @@ aue_stop(struct aue_softc *sc)
 		err = usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_RX]);
 		if (err) {
 			printf("%s: abort rx pipe failed: %s\n",
-			    USBDEVNAME(sc->aue_dev), usbd_errstr(err));
+			    sc->aue_dev.dv_xname, usbd_errstr(err));
 		}
 		err = usbd_close_pipe(sc->aue_ep[AUE_ENDPT_RX]);
 		if (err) {
 			printf("%s: close rx pipe failed: %s\n",
-			    USBDEVNAME(sc->aue_dev), usbd_errstr(err));
+			    sc->aue_dev.dv_xname, usbd_errstr(err));
 		}
 		sc->aue_ep[AUE_ENDPT_RX] = NULL;
 	}
@@ -1659,12 +1659,12 @@ aue_stop(struct aue_softc *sc)
 		err = usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_TX]);
 		if (err) {
 			printf("%s: abort tx pipe failed: %s\n",
-			    USBDEVNAME(sc->aue_dev), usbd_errstr(err));
+			    sc->aue_dev.dv_xname, usbd_errstr(err));
 		}
 		err = usbd_close_pipe(sc->aue_ep[AUE_ENDPT_TX]);
 		if (err) {
 			printf("%s: close tx pipe failed: %s\n",
-			    USBDEVNAME(sc->aue_dev), usbd_errstr(err));
+			    sc->aue_dev.dv_xname, usbd_errstr(err));
 		}
 		sc->aue_ep[AUE_ENDPT_TX] = NULL;
 	}
@@ -1673,12 +1673,12 @@ aue_stop(struct aue_softc *sc)
 		err = usbd_abort_pipe(sc->aue_ep[AUE_ENDPT_INTR]);
 		if (err) {
 			printf("%s: abort intr pipe failed: %s\n",
-			    USBDEVNAME(sc->aue_dev), usbd_errstr(err));
+			    sc->aue_dev.dv_xname, usbd_errstr(err));
 		}
 		err = usbd_close_pipe(sc->aue_ep[AUE_ENDPT_INTR]);
 		if (err) {
 			printf("%s: close intr pipe failed: %s\n",
-			    USBDEVNAME(sc->aue_dev), usbd_errstr(err));
+			    sc->aue_dev.dv_xname, usbd_errstr(err));
 		}
 		sc->aue_ep[AUE_ENDPT_INTR] = NULL;
 	}