treat usb vendor/product names as a locator, and have usbd_print handle it,

so that it shows up before the :.  as a result, all the usb devices do not
need to have name printing code anymore.  all this now works and prints
nicely because usbd_probe_and_attach() is serialized.  ok kettenis

47 files changed, 92 insertions, 333 deletions

diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index f5369d0d276..b595de6dc3a 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atu.c,v 1.88 2007/10/06 16:01:17 jsg Exp $ */
+/*	$OpenBSD: if_atu.c,v 1.89 2007/10/11 18:33:13 deraadt Exp $ */
 /*
  * Copyright (c) 2003, 2004
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  All rights reserved.
@@ -1254,7 +1254,6 @@ atu_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct atu_softc		*sc = (struct atu_softc *)self;
 	struct usb_attach_arg		*uaa = aux;
-	char				*devinfop;
 	usbd_status			err;
 	usbd_device_handle		dev = uaa->device;
 	u_int8_t			mode, channel;
@@ -1262,10 +1261,6 @@ atu_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->sc_state = ATU_S_UNCONFIG;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s", sc->atu_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	err = usbd_set_config_no(dev, ATU_CONFIG_NO, 1);
 	if (err) {
 		printf("%s: setting config no failed\n",
@@ -1313,8 +1308,6 @@ atu_attach(struct device *parent, struct device *self, void *aux)
 		DPRINTF(("%s: starting internal firmware download\n",
 		    sc->atu_dev.dv_xname));
 
-		printf("\n");
-
 		if (rootvp == NULL)
 			mountroothook_establish(atu_internal_firmware, sc);
 		else
@@ -1407,7 +1400,7 @@ atu_complete_attach(struct atu_softc *sc)
 	/* read device config & get MAC address */
 	err = atu_get_card_config(sc);
 	if (err) {
-		printf("\n%s: could not get card cfg!\n",
+		printf("%s: could not get card cfg!\n",
 		    sc->atu_dev.dv_xname);
 		return;
 	}
@@ -1427,7 +1420,8 @@ atu_complete_attach(struct atu_softc *sc)
 #endif /* ATU_DEBUG */
 
 	/* Show the world our MAC address */
-	printf(", address %s\n", ether_sprintf(ic->ic_myaddr));
+	printf("%s: address %s\n", sc->atu_dev.dv_xname,
+	    ether_sprintf(ic->ic_myaddr));
 
 	sc->atu_cdata.atu_tx_inuse = 0;
 
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index a9b2aabe865..ab8dc48e9c3 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.66 2007/09/17 01:40:38 fgsch Exp $ */
+/*	$OpenBSD: if_aue.c,v 1.67 2007/10/11 18:33:13 deraadt Exp $ */
 /*	$NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -714,7 +714,6 @@ aue_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct aue_softc	*sc = (struct aue_softc *)self;
 	struct usb_attach_arg	*uaa = aux;
-	char			*devinfop;
 	int			s;
 	u_char			eaddr[ETHER_ADDR_LEN];
 	struct ifnet		*ifp;
@@ -728,10 +727,6 @@ 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", 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",
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 0dd3ecaab56..f0a2d7cb55a 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_axe.c,v 1.78 2007/06/14 10:11:15 mbalmer Exp $	*/
+/*	$OpenBSD: if_axe.c,v 1.79 2007/10/11 18:33:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -583,21 +583,16 @@ axe_attach(struct device *parent, struct device *self, void *aux)
 	usb_endpoint_descriptor_t *ed;
 	struct mii_data	*mii;
 	u_char eaddr[ETHER_ADDR_LEN];
-	char *devinfop;
 	char *devname = sc->axe_dev.dv_xname;
 	struct ifnet *ifp;
 	int i, s;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n");
-
 	sc->axe_unit = self->dv_unit; /*device_get_unit(self);*/
 
 	err = usbd_set_config_no(dev, AXE_CONFIG_NO, 1);
 	if (err) {
-		printf("axe%d: getting interface handle failed\n",
-		    sc->axe_unit);
-		usbd_devinfo_free(devinfop);
+		printf("%s: getting interface handle failed\n",
+		    sc->axe_dev.dv_xname);
 		return;
 	}
 
@@ -609,9 +604,8 @@ axe_attach(struct device *parent, struct device *self, void *aux)
 
 	err = usbd_device2interface_handle(dev, AXE_IFACE_IDX, &sc->axe_iface);
 	if (err) {
-		printf("axe%d: getting interface handle failed\n",
-		    sc->axe_unit);
-		usbd_devinfo_free(devinfop);
+		printf("%s: getting interface handle failed\n",
+		    sc->axe_dev.dv_xname);
 		return;
 	}
 
@@ -621,9 +615,6 @@ axe_attach(struct device *parent, struct device *self, void *aux)
 
 	id = usbd_get_interface_descriptor(sc->axe_iface);
 
-	printf("%s: %s", sc->axe_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	/* decide on what our bufsize will be */
 	if (sc->axe_flags & AX178 || sc->axe_flags & AX772)
 		sc->axe_bufsz = (sc->axe_udev->speed == USB_SPEED_HIGH) ?
@@ -635,7 +626,7 @@ axe_attach(struct device *parent, struct device *self, void *aux)
 	for (i = 0; i < id->bNumEndpoints; i++) {
 		ed = usbd_interface2endpoint_descriptor(sc->axe_iface, i);
 		if (!ed) {
-			printf(" couldn't get ep %d\n", i);
+			printf(", couldn't get ep %d\n", i);
 			return;
 		}
 		if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index 28ec3cbf7d6..5b232a9f6c7 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cdce.c,v 1.38 2007/09/17 01:40:38 fgsch Exp $ */
+/*	$OpenBSD: if_cdce.c,v 1.39 2007/10/11 18:33:14 deraadt Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -158,7 +158,6 @@ cdce_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct cdce_softc		*sc = (struct cdce_softc *)self;
 	struct usb_attach_arg		*uaa = aux;
-	char				*devinfop;
 	int				 s;
 	struct ifnet			*ifp;
 	usbd_device_handle		 dev = uaa->device;
@@ -176,10 +175,6 @@ cdce_attach(struct device *parent, struct device *self, void *aux)
 	int				 ctl_ifcno = -1;
 	int				 data_ifcno = -1;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", sc->cdce_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	sc->cdce_udev = uaa->device;
 	sc->cdce_ctl_iface = uaa->iface;
 	id = usbd_get_interface_descriptor(sc->cdce_ctl_iface);
diff --git a/sys/dev/usb/if_cdcef.c b/sys/dev/usb/if_cdcef.c
index caca58d6a43..39361e29bcb 100644
--- a/sys/dev/usb/if_cdcef.c
+++ b/sys/dev/usb/if_cdcef.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cdcef.c,v 1.17 2007/06/14 06:55:10 mbalmer Exp $	*/
+/*	$OpenBSD: if_cdcef.c,v 1.18 2007/10/11 18:33:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
@@ -142,7 +142,6 @@ cdcef_attach(struct device *parent, struct device *self, void *aux)
 	struct cdcef_softc *sc = (struct cdcef_softc *)self;
 	struct usbf_attach_arg *uaa = aux;
 	usbf_device_handle dev = uaa->device;
-	char *devinfop;
 	struct ifnet *ifp;
 	usbf_status err;
 	usb_cdc_union_descriptor_t udesc;
@@ -155,10 +154,6 @@ cdcef_attach(struct device *parent, struct device *self, void *aux)
 	    CDCEF_PRODUCT_ID, CDCEF_DEVICE_CODE, CDCEF_VENDOR_STRING,
 	    CDCEF_PRODUCT_STRING, CDCEF_SERIAL_STRING);
 
-	devinfop = usbf_devinfo_alloc(dev);
-	printf(": %s\n", devinfop);
-	usbf_devinfo_free(devinfop);
-
 	/* Fill in the fields needed by the parent device. */
 	sc->sc_dev.methods = &cdcef_methods;
 
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index a96137bb4b2..e294df90c93 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cue.c,v 1.46 2007/09/17 01:40:38 fgsch Exp $ */
+/*	$OpenBSD: if_cue.c,v 1.47 2007/10/11 18:33:14 deraadt Exp $ */
 /*	$NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -447,7 +447,6 @@ cue_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct cue_softc	*sc = (struct cue_softc *)self;
 	struct usb_attach_arg	*uaa = aux;
-	char			*devinfop;
 	int			s;
 	u_char			eaddr[ETHER_ADDR_LEN];
 	usbd_device_handle	dev = uaa->device;
@@ -460,10 +459,6 @@ cue_attach(struct device *parent, struct device *self, void *aux)
 
 	DPRINTFN(5,(" : cue_attach: sc=%p, dev=%p", sc, dev));
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", sc->cue_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	err = usbd_set_config_no(dev, CUE_CONFIG_NO, 1);
 	if (err) {
 		printf("%s: setting config no failed\n",
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 2e34adab85b..99671a1bde0 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_kue.c,v 1.55 2007/06/14 10:11:15 mbalmer Exp $ */
+/*	$OpenBSD: if_kue.c,v 1.56 2007/10/11 18:33:14 deraadt Exp $ */
 /*	$NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -524,16 +524,11 @@ kue_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct kue_softc	*sc = (struct kue_softc *)self;
 	struct usb_attach_arg	*uaa = aux;
-	char			*devinfop;
 	usbd_device_handle	dev = uaa->device;
 	usbd_status		err;
 
 	DPRINTFN(5,(" : kue_attach: sc=%p, dev=%p", sc, dev));
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", sc->kue_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	err = usbd_set_config_no(dev, KUE_CONFIG_NO, 1);
 	if (err) {
 		printf("%s: setting config no failed\n",
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index 58dbe188796..d1ebf3024e6 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral.c,v 1.101 2007/09/07 19:05:05 damien Exp $	*/
+/*	$OpenBSD: if_ral.c,v 1.102 2007/10/11 18:33:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -227,15 +227,10 @@ ural_attach(struct device *parent, struct device *self, void *aux)
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	usbd_status error;
-	char *devinfop;
 	int i;
 
 	sc->sc_udev = uaa->device;
 
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	if (usbd_set_config_no(sc->sc_udev, RAL_CONFIG_NO, 0) != 0) {
 		printf("%s: could not set configuration no\n",
 		    sc->sc_dev.dv_xname);
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index d0f7ac2b7fd..d243893a19f 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rum.c,v 1.65 2007/09/07 19:05:05 damien Exp $	*/
+/*	$OpenBSD: if_rum.c,v 1.66 2007/10/11 18:33:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -268,16 +268,11 @@ rum_attach(struct device *parent, struct device *self, void *aux)
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	usbd_status error;
-	char *devinfop;
 	int i, ntries;
 	uint32_t tmp;
 
 	sc->sc_udev = uaa->device;
 
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	if (usbd_set_config_no(sc->sc_udev, RT2573_CONFIG_NO, 0) != 0) {
 		printf("%s: could not set configuration no\n",
 		    sc->sc_dev.dv_xname);
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index 0cb59f2047b..0b40c365431 100644
--- a/sys/dev/usb/if_uath.c
+++ b/sys/dev/usb/if_uath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_uath.c,v 1.30 2007/09/11 19:53:58 damien Exp $	*/
+/*	$OpenBSD: if_uath.c,v 1.31 2007/10/11 18:33:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -253,17 +253,12 @@ uath_attach(struct device *parent, struct device *self, void *aux)
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = &ic->ic_if;
 	usbd_status error;
-	char *devinfop;
 	int i;
 
 	sc->sc_udev = uaa->device;
 	sc->sc_uhub = uaa->device->myhub;
 	sc->sc_port = uaa->port;
 
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	sc->sc_flags = uath_lookup(uaa->vendor, uaa->product)->flags;
 
 	if (usbd_set_config_no(sc->sc_udev, UATH_CONFIG_NO, 0) != 0) {
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 7a002a227a8..fc14f89137c 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udav.c,v 1.34 2007/06/14 10:11:15 mbalmer Exp $ */
+/*	$OpenBSD: if_udav.c,v 1.35 2007/10/11 18:33:14 deraadt Exp $ */
 /*	$NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
@@ -194,17 +194,12 @@ udav_attach(struct device *parent, struct device *self, void *aux)
 	usbd_status err;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
-	char *devinfop;
 	char *devname = sc->sc_dev.dv_xname;
 	struct ifnet *ifp;
 	struct mii_data *mii;
 	u_char eaddr[ETHER_ADDR_LEN];
 	int i, s;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s", devname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	/* Move the device into the configured state. */
 	err = usbd_set_config_no(dev, UDAV_CONFIG_NO, 1);
 	if (err) {
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 806d079e3df..46618ea306c 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upl.c,v 1.39 2007/09/17 01:40:38 fgsch Exp $ */
+/*	$OpenBSD: if_upl.c,v 1.40 2007/10/11 18:33:14 deraadt Exp $ */
 /*	$NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -235,7 +235,6 @@ upl_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct upl_softc	*sc = (struct upl_softc *)self;
 	struct usb_attach_arg	*uaa = aux;
-	char			*devinfop;
 	int			s;
 	usbd_device_handle	dev = uaa->device;
 	usbd_interface_handle	iface;
@@ -247,10 +246,6 @@ upl_attach(struct device *parent, struct device *self, void *aux)
 
 	DPRINTFN(5,(" : upl_attach: sc=%p, dev=%p", sc, dev));
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	err = usbd_set_config_no(dev, UPL_CONFIG_NO, 1);
 	if (err) {
 		printf("%s: setting config no failed\n",
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index d49b4f9cffd..6c45ad8e1f3 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_url.c,v 1.48 2007/06/14 10:11:15 mbalmer Exp $ */
+/*	$OpenBSD: if_url.c,v 1.49 2007/10/11 18:33:14 deraadt Exp $ */
 /*	$NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -196,17 +196,12 @@ url_attach(struct device *parent, struct device *self, void *aux)
 	usbd_status err;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
-	char *devinfop;
 	char *devname = sc->sc_dev.dv_xname;
 	struct ifnet *ifp;
 	struct mii_data *mii;
 	u_char eaddr[ETHER_ADDR_LEN];
 	int i, s;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", devname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	/* Move the device into the configured state. */
 	err = usbd_set_config_no(dev, URL_CONFIG_NO, 1);
 	if (err) {
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 12265c62103..8b5711ff729 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_usb.c,v 1.43 2007/09/12 18:45:14 mk Exp $ */
+/*	$OpenBSD: if_wi_usb.c,v 1.44 2007/10/11 18:33:14 deraadt Exp $ */
 
 /*
  * Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -301,7 +301,6 @@ wi_usb_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct wi_usb_softc	*sc = (struct wi_usb_softc *)self;
 	struct usb_attach_arg	*uaa = aux;
-	char			*devinfop;
 /*	int			s; */
 	usbd_device_handle	dev = uaa->device;
 	usbd_interface_handle	iface;
@@ -314,15 +313,10 @@ wi_usb_attach(struct device *parent, struct device *self, void *aux)
 
 	err = usbd_set_config_no(dev, WI_USB_CONFIG_NO, 1);
 	if (err) {
-		printf("%s: setting config no failed\n",
-		    sc->wi_usb_dev.dv_xname);
+		printf("%s: setting config no failed\n", sc->wi_usb_dev.dv_xname);
 		return;
 	}
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", sc->wi_usb_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	/* XXX - any tasks? */
 
 	err = usbd_device2interface_handle(dev, WI_USB_IFACE_IDX, &iface);
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index db9ec02b625..945b19aface 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_zyd.c,v 1.60 2007/09/07 19:05:05 damien Exp $	*/
+/*	$OpenBSD: if_zyd.c,v 1.61 2007/10/11 18:33:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -279,15 +279,10 @@ zyd_attach(struct device *parent, struct device *self, void *aux)
 {
 	struct zyd_softc *sc = (struct zyd_softc *)self;
 	struct usb_attach_arg *uaa = aux;
-	char *devinfop;
 	usb_device_descriptor_t* ddesc;
 
 	sc->sc_udev = uaa->device;
 
-	devinfop = usbd_devinfo_alloc(sc->sc_udev, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	sc->mac_rev = zyd_lookup(uaa->vendor, uaa->product)->rev;
 
 	ddesc = usbd_get_device_descriptor(sc->sc_udev);
diff --git a/sys/dev/usb/moscom.c b/sys/dev/usb/moscom.c
index ac0413dcf92..f0873cfb2c8 100644
--- a/sys/dev/usb/moscom.c
+++ b/sys/dev/usb/moscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: moscom.c,v 1.10 2007/06/14 10:11:15 mbalmer Exp $	*/
+/*	$OpenBSD: moscom.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -204,14 +204,10 @@ moscom_attach(struct device *parent, struct device *self, void *aux)
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	usbd_status error;
-	char *devinfop;
 	int i;
 
 	bzero(&uca, sizeof(uca));
 	sc->sc_udev = uaa->device;
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
 
 	if (usbd_set_config_index(sc->sc_udev, MOSCOM_CONFIG_NO, 1) != 0) {
 		printf("%s: could not set configuration no\n",
diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c
index e8e036702c8..abc16b1b911 100644
--- a/sys/dev/usb/uark.c
+++ b/sys/dev/usb/uark.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uark.c,v 1.10 2007/06/14 10:11:15 mbalmer Exp $	*/
+/*	$OpenBSD: uark.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -131,14 +131,10 @@ uark_attach(struct device *parent, struct device *self, void *aux)
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	usbd_status error;
-	char *devinfop;
 	int i;
 
 	bzero(&uca, sizeof(uca));
 	sc->sc_udev = uaa->device;
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
 
 	if (usbd_set_config_index(sc->sc_udev, UARK_CONFIG_NO, 1) != 0) {
 		printf("%s: could not set configuration no\n",
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index affd2dfc490..d69fcd12780 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.53 2007/09/28 07:55:15 jakemsr Exp $ */
+/*	$OpenBSD: uaudio.c,v 1.54 2007/10/11 18:33:14 deraadt Exp $ */
 /*	$NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $	*/
 
 /*
@@ -403,14 +403,9 @@ uaudio_attach(struct device *parent, struct device *self, void *aux)
 	struct usb_attach_arg *uaa = aux;
 	usb_interface_descriptor_t *id;
 	usb_config_descriptor_t *cdesc;
-	char *devinfop;
 	usbd_status err;
 	int i, j, found;
 
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf(": %s\n", devinfop);
-	usbd_devinfo_free(devinfop);
-
 	sc->sc_udev = uaa->device;
 
 	cdesc = usbd_get_config_descriptor(sc->sc_udev);
diff --git a/sys/dev/usb/uberry.c b/sys/dev/usb/uberry.c
index 3beae317c7b..ffab38b5090 100644
--- a/sys/dev/usb/uberry.c
+++ b/sys/dev/usb/uberry.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uberry.c,v 1.14 2007/09/17 01:40:38 fgsch Exp $	*/
+/*	$OpenBSD: uberry.c,v 1.15 2007/10/11 18:33:14 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
@@ -93,16 +93,11 @@ uberry_attach(struct device *parent, struct device *self, void *aux)
 	struct uberry_softc *sc = (struct uberry_softc *)self;
 	struct usb_attach_arg *uaa = aux;
 	usb_device_descriptor_t *dd;
-	char *devinfop;
 
 	sc->sc_udev = uaa->device;
 
 	dd = usbd_get_device_descriptor(uaa->device);
 
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	/* Enable configuration, to keep it connected... */
 	if (usbd_set_config_no(sc->sc_udev, UBERRY_CONFIG_NO, 1) != 0) {
 		/*
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index c848035b900..811a9fdc40c 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsa.c,v 1.30 2007/06/14 10:11:15 mbalmer Exp $ 	*/
+/*	$OpenBSD: ubsa.c,v 1.31 2007/10/11 18:33:14 deraadt Exp $ 	*/
 /*	$NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $	*/
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -275,16 +275,11 @@ ubsa_attach(struct device *parent, struct device *self, void *aux)
 	usb_config_descriptor_t *cdesc;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
-	char *devinfop;
 	const char *devname = sc->sc_dev.dv_xname;
 	usbd_status err;
 	struct ucom_attach_args uca;
 	int i;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", devname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	sc->sc_udev = dev;
 
 	/*
diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c
index 52dbc64230e..6868846ec93 100644
--- a/sys/dev/usb/ubt.c
+++ b/sys/dev/usb/ubt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubt.c,v 1.8 2007/06/14 10:11:15 mbalmer Exp $ */
+/* $OpenBSD: ubt.c,v 1.9 2007/10/11 18:33:14 deraadt Exp $ */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -307,7 +307,6 @@ ubt_attach(struct device *parent, struct device *self, void *aux)
 	struct usb_attach_arg *uaa = aux;
 	usb_config_descriptor_t *cd;
 	usb_endpoint_descriptor_t *ed;
-	char *devinfop;
 	int err;
 	uint8_t count, i;
 
@@ -315,10 +314,6 @@ ubt_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->sc_udev = uaa->device;
 
-	devinfop = usbd_devinfo_alloc(sc->sc_udev, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	/*
 	 * Move the device into the configured state
 	 */
diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c
index 4217aa756ad..f45d961d0bc 100644
--- a/sys/dev/usb/uchcom.c
+++ b/sys/dev/usb/uchcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uchcom.c,v 1.3 2007/09/09 06:22:05 jsg Exp $	*/
+/*	$OpenBSD: uchcom.c,v 1.4 2007/10/11 18:33:14 deraadt Exp $	*/
 /*	$NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $	*/
 
 /*
@@ -267,13 +267,8 @@ uchcom_attach(struct device *parent, struct device *self, void *aux)
 	struct usb_attach_arg *uaa = aux;
 	struct ucom_attach_args uca;
 	usbd_device_handle dev = uaa->device;
-	char *devinfop;
 	struct uchcom_endpoints endpoints;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
         sc->sc_udev = dev;
 	sc->sc_dying = 0;
 	sc->sc_dtr = sc->sc_rts = -1;
@@ -286,10 +281,10 @@ uchcom_attach(struct device *parent, struct device *self, void *aux)
 
 	switch (uaa->release) {
 	case UCHCOM_REV_CH340:
-		printf(": CH340\n");
+		printf("%s: CH340\n", sc->sc_dev.dv_xname);
 		break;
 	default:
-		printf(": CH341\n");
+		printf("%s: CH341\n", sc->sc_dev.dv_xname);
 		break;
 	}
 
diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c
index 93cb4ddc0be..550803ab995 100644
--- a/sys/dev/usb/udcf.c
+++ b/sys/dev/usb/udcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udcf.c,v 1.38 2007/06/14 10:11:15 mbalmer Exp $ */
+/*	$OpenBSD: udcf.c,v 1.39 2007/10/11 18:33:14 deraadt Exp $ */
 
 /*
  * Copyright (c) 2006 Marc Balmer <mbalmer@openbsd.org>
@@ -171,7 +171,6 @@ udcf_attach(struct device *parent, struct device *self, void *aux)
 	usbd_device_handle		 dev = uaa->device;
 	usbd_interface_handle		 iface;
 	struct timeval			 t;
-	char				*devinfop;
 	usb_interface_descriptor_t	*id;
 	usbd_status			 err;
 	usb_device_request_t		 req;
@@ -179,21 +178,17 @@ udcf_attach(struct device *parent, struct device *self, void *aux)
 	int				 actlen;
 
 	if ((err = usbd_set_config_index(dev, 0, 1))) {
-		DPRINTF(("\n%s: failed to set configuration, err=%s\n",
+		DPRINTF(("%s: failed to set configuration, err=%s\n",
 		    sc->sc_dev.dv_xname, usbd_errstr(err)));
 		goto fishy;
 	}
 
 	if ((err = usbd_device2interface_handle(dev, 0, &iface))) {
-		DPRINTF(("\n%s: failed to get interface, err=%s\n",
+		DPRINTF(("%s: failed to get interface, err=%s\n",
 		    sc->sc_dev.dv_xname, usbd_errstr(err)));
 		goto fishy;
 	}
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	id = usbd_get_interface_descriptor(iface);
 
 	sc->sc_udev = dev;
diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c
index 130a54d11f5..0963a8e9791 100644
--- a/sys/dev/usb/udsbr.c
+++ b/sys/dev/usb/udsbr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udsbr.c,v 1.18 2007/06/14 10:11:15 mbalmer Exp $	*/
+/*	$OpenBSD: udsbr.c,v 1.19 2007/10/11 18:33:14 deraadt Exp $	*/
 /*	$NetBSD: udsbr.c,v 1.7 2002/07/11 21:14:27 augustss Exp $	*/
 
 /*
@@ -139,15 +139,10 @@ udsbr_attach(struct device *parent, struct device *self, void *aux)
 	struct udsbr_softc	*sc = (struct udsbr_softc *)self;
 	struct usb_attach_arg	*uaa = aux;
 	usbd_device_handle	dev = uaa->device;
-	char			*devinfop;
 	usbd_status		err;
 
 	DPRINTFN(10,("udsbr_attach: sc=%p\n", sc));
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	err = usbd_set_config_no(dev, UDSBR_CONFIG_NO, 1);
 	if (err) {
 		printf("%s: setting config no failed\n",
diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c
index a13e87fd199..c4066f51fd2 100644
--- a/sys/dev/usb/ueagle.c
+++ b/sys/dev/usb/ueagle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ueagle.c,v 1.22 2007/09/07 19:05:05 damien Exp $	*/
+/*	$OpenBSD: ueagle.c,v 1.23 2007/10/11 18:33:15 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2003-2006
@@ -175,11 +175,9 @@ ueagle_attach(struct device *parent, struct device *self, void *aux)
 	struct ueagle_softc *sc = (struct ueagle_softc *)self;
 	struct usb_attach_arg *uaa = aux;
 	struct ifnet *ifp = &sc->sc_if;
-	char *devinfop;
 	uint8_t addr[ETHER_ADDR_LEN];
 
 	sc->sc_udev = uaa->device;
-	printf("\n");
 
 	/*
 	 * Pre-firmware modems must be flashed and reset first.  They will
@@ -197,10 +195,6 @@ ueagle_attach(struct device *parent, struct device *self, void *aux)
 		return;
 	}
 
-	devinfop = usbd_devinfo_alloc(sc->sc_udev, 0);
-	printf("%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	if (usbd_set_config_no(sc->sc_udev, UEAGLE_CONFIG_NO, 0) != 0) {
 		printf("%s: could not set configuration no\n",
 		    sc->sc_dev.dv_xname);
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index b95bea105aa..aa151224be8 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uftdi.c,v 1.42 2007/09/19 12:39:21 pyr Exp $ 	*/
+/*	$OpenBSD: uftdi.c,v 1.43 2007/10/11 18:33:15 deraadt Exp $ 	*/
 /*	$NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $	*/
 
 /*
@@ -210,7 +210,6 @@ uftdi_attach(struct device *parent, struct device *self, void *aux)
 	usbd_interface_handle iface;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
-	char *devinfop;
 	char *devname = sc->sc_dev.dv_xname;
 	int i;
 	usbd_status err;
@@ -222,24 +221,20 @@ uftdi_attach(struct device *parent, struct device *self, void *aux)
 		/* Move the device into the configured state. */
 		err = usbd_set_config_index(dev, UFTDI_CONFIG_INDEX, 1);
 		if (err) {
-			printf("\n%s: failed to set configuration, err=%s\n",
-			       devname, usbd_errstr(err));
+			printf("%s: failed to set configuration, err=%s\n",
+			    sc->sc_dev.dv_xname, usbd_errstr(err));
 			goto bad;
 		}
 
 		err = usbd_device2interface_handle(dev, UFTDI_IFACE_INDEX, &iface);
 		if (err) {
-			printf("\n%s: failed to get interface, err=%s\n",
-			       devname, usbd_errstr(err));
+			printf("%s: failed to get interface, err=%s\n",
+			    sc->sc_dev.dv_xname, usbd_errstr(err));
 			goto bad;
 		}
 	} else
 		iface = uaa->iface;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", devname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	id = usbd_get_interface_descriptor(iface);
 
 	sc->sc_udev = dev;
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 335acfc13b9..d7565765ddc 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.50 2007/06/29 13:31:42 henning Exp $ */
+/*	$OpenBSD: ugen.c,v 1.51 2007/10/11 18:33:15 deraadt Exp $ */
 /*	$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -179,14 +179,9 @@ ugen_attach(struct device *parent, struct device *self, void *aux)
 	struct ugen_softc *sc = (struct ugen_softc *)self;
 	struct usb_attach_arg *uaa = aux;
 	usbd_device_handle udev;
-	char *devinfop;
 	usbd_status err;
 	int conf;
 
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	sc->sc_udev = udev = uaa->device;
 
 	/* First set configuration index 0, the default one for ugen. */
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index f54f11d045e..6ee1573ae4e 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhidev.c,v 1.29 2007/09/11 13:39:34 gilles Exp $	*/
+/*	$OpenBSD: uhidev.c,v 1.30 2007/10/11 18:33:15 deraadt Exp $	*/
 /*	$NetBSD: uhidev.c,v 1.14 2003/03/11 16:44:00 augustss Exp $	*/
 
 /*
@@ -144,16 +144,13 @@ uhidev_attach(struct device *parent, struct device *self, void *aux)
 	void *desc;
 	const void *descptr;
 	usbd_status err;
-	char *devinfop;
 
 	sc->sc_udev = uaa->device;
 	sc->sc_iface = iface;
 	id = usbd_get_interface_descriptor(iface);
 
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s, iclass %d/%d\n", sc->sc_dev.dv_xname,
-	       devinfop, id->bInterfaceClass, id->bInterfaceSubClass);
-	usbd_devinfo_free(devinfop);
+	printf("%s: iclass %d/%d\n", sc->sc_dev.dv_xname,
+	    id->bInterfaceClass, id->bInterfaceSubClass);
 
 	(void)usbd_set_idle(iface, 0, 0);
 #if 0
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index 9551bf12ea0..bccf103dc58 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhub.c,v 1.47 2007/06/14 10:11:16 mbalmer Exp $ */
+/*	$OpenBSD: uhub.c,v 1.48 2007/10/11 18:33:15 deraadt Exp $ */
 /*	$NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $	*/
 
@@ -132,7 +132,6 @@ uhub_attach(struct device *parent, struct device *self, void *aux)
 	struct uhub_softc *sc = (struct uhub_softc *)self;
 	struct usb_attach_arg *uaa = aux;
 	usbd_device_handle dev = uaa->device;
-	char *devinfop;
 	usbd_status err;
 	struct usbd_hub *hub = NULL;
 	usb_device_request_t req;
@@ -145,10 +144,6 @@ uhub_attach(struct device *parent, struct device *self, void *aux)
 	DPRINTFN(1,("uhub_attach\n"));
 	sc->sc_hub = dev;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf(": %s\n", devinfop);
-	usbd_devinfo_free(devinfop);
-
 	err = usbd_set_config_index(dev, 0, 1);
 	if (err) {
 		DPRINTF(("%s: configuration failed, error=%s\n",
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
index 0bde75186f2..75de1cf0ed6 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/dev/usb/uipaq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipaq.c,v 1.13 2007/09/02 04:20:25 jsg Exp $	*/
+/*	$OpenBSD: uipaq.c,v 1.14 2007/10/11 18:33:15 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -172,7 +172,6 @@ uipaq_attach(struct device *parent, struct device *self, void *aux)
 	usbd_interface_handle iface;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
-	char *devinfop;
 	char *devname = sc->sc_dev.dv_xname;
 	int i;
 	usbd_status err;
@@ -183,22 +182,18 @@ uipaq_attach(struct device *parent, struct device *self, void *aux)
 	/* Move the device into the configured state. */
 	err = usbd_set_config_no(dev, UIPAQ_CONFIG_NO, 1);
 	if (err) {
-		printf("\n%s: failed to set configuration, err=%s\n",
-		    devname, usbd_errstr(err));
+		printf(": failed to set configuration, err=%s\n",
+		    usbd_errstr(err));
 		goto bad;
 	}
 
 	err = usbd_device2interface_handle(dev, UIPAQ_IFACE_INDEX, &iface);
 	if (err) {
-		printf("\n%s: failed to get interface, err=%s\n",
-		    devname, usbd_errstr(err));
+		printf(": failed to get interface, err=%s\n",
+		    usbd_errstr(err));
 		goto bad;
 	}
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", devname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	sc->sc_flags = uipaq_lookup(uaa->vendor, uaa->product)->uv_flags;
 
 	id = usbd_get_interface_descriptor(iface);
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 892b6b34198..f84cc5e98ed 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ulpt.c,v 1.32 2007/06/14 10:11:16 mbalmer Exp $ */
+/*	$OpenBSD: ulpt.c,v 1.33 2007/10/11 18:33:15 deraadt Exp $ */
 /*	$NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $	*/
 
@@ -176,17 +176,14 @@ ulpt_attach(struct device *parent, struct device *self, void *aux)
 	usb_interface_descriptor_t *id, *iend;
 	usb_config_descriptor_t *cdesc;
 	usbd_status err;
-	char *devinfop;
 	usb_endpoint_descriptor_t *ed;
 	u_int8_t epcount;
 	int i, altno;
 
 	DPRINTFN(10,("ulpt_attach: sc=%p\n", sc));
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s, iclass %d/%d\n", sc->sc_dev.dv_xname,
-	       devinfop, ifcd->bInterfaceClass, ifcd->bInterfaceSubClass);
-	usbd_devinfo_free(devinfop);
+	//printf("%s: iclass %d/%d\n", sc->sc_dev.dv_xname,
+	//    ifcd->bInterfaceClass, ifcd->bInterfaceSubClass);
 
 	/* XXX
 	 * Stepping through the alternate settings needs to be abstracted out.
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 0752071aeae..7190b386374 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umass.c,v 1.53 2007/09/15 19:22:18 bluhm Exp $ */
+/*	$OpenBSD: umass.c,v 1.54 2007/10/11 18:33:15 deraadt Exp $ */
 /*	$NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $	*/
 
 /*
@@ -317,14 +317,9 @@ umass_attach(struct device *parent, struct device *self, void *aux)
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	const char *sWire, *sCommand;
-	char *devinfop;
 	usbd_status err;
 	int i, bno, error;
 
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	sc->sc_udev = uaa->device;
 	sc->sc_iface = uaa->iface;
 	sc->sc_ifaceno = uaa->ifaceno;
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 52446456d28..f1b80b33e58 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umct.c,v 1.26 2007/06/14 10:11:16 mbalmer Exp $	*/
+/*	$OpenBSD: umct.c,v 1.27 2007/10/11 18:33:15 deraadt Exp $	*/
 /*	$NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -195,16 +195,11 @@ umct_attach(struct device *parent, struct device *self, void *aux)
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 
-	char *devinfop;
 	char *devname = sc->sc_dev.dv_xname;
 	usbd_status err;
 	int i;
 	struct ucom_attach_args uca;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", devname, devinfop);
-	usbd_devinfo_free(devinfop);
-
         sc->sc_udev = dev;
 	sc->sc_product = uaa->product;
 
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index 7cb708d5ba7..b7ab82e5245 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidi.c,v 1.23 2007/10/06 23:50:55 krw Exp $	*/
+/*	$OpenBSD: umidi.c,v 1.24 2007/10/11 18:33:15 deraadt Exp $	*/
 /*	$NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -182,15 +182,10 @@ umidi_attach(struct device *parent, struct device *self, void *aux)
 	usbd_status err;
 	struct umidi_softc *sc = (struct umidi_softc *)self;
 	struct usb_attach_arg *uaa = aux;
-	char *devinfop;
 	int i;
 
 	DPRINTFN(1,("umidi_attach\n"));
 
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	sc->sc_iface = uaa->iface;
 	sc->sc_udev = uaa->device;
 
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index d5334e0f040..2411d8b5faa 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umodem.c,v 1.34 2007/06/18 09:55:58 mbalmer Exp $ */
+/*	$OpenBSD: umodem.c,v 1.35 2007/10/11 18:33:15 deraadt Exp $ */
 /*	$NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $	*/
 
 /*
@@ -212,22 +212,17 @@ umodem_attach(struct device *parent, struct device *self, void *aux)
 	const usb_cdc_union_descriptor_t *uniond;
 	const usb_descriptor_t *desc;
 	usbd_desc_iter_t iter;
-	char *devinfop;
 	usbd_status err;
 	int current_iface_no = -1;
 	int i;
 	struct ucom_attach_args uca;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n");
-
 	sc->sc_udev = dev;
 	sc->sc_ctl_iface = uaa->iface;
 
 	id = usbd_get_interface_descriptor(sc->sc_ctl_iface);
-	printf("%s: %s, iclass %d/%d\n", sc->sc_dev.dv_xname,
-	       devinfop, id->bInterfaceClass, id->bInterfaceSubClass);
-	usbd_devinfo_free(devinfop);
+	//printf("%s: iclass %d/%d\n", sc->sc_dev.dv_xname,
+	//    id->bInterfaceClass, id->bInterfaceSubClass);
 	sc->sc_ctl_iface_no = id->bInterfaceNumber;
 
 	/* Get the data interface no. and capabilities */
diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index 1c7060f9b60..a883a81118a 100644
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umsm.c,v 1.16 2007/06/19 23:59:27 jcs Exp $	*/
+/*	$OpenBSD: umsm.c,v 1.17 2007/10/11 18:33:15 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -115,14 +115,10 @@ umsm_attach(struct device *parent, struct device *self, void *aux)
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	usbd_status error;
-	char *devinfop;
 	int i;
 
 	bzero(&uca, sizeof(uca));
 	sc->sc_udev = uaa->device;
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
 
 	if (usbd_set_config_index(sc->sc_udev, UMSM_CONFIG_NO, 1) != 0) {
 		printf("%s: could not set configuration no\n",
diff --git a/sys/dev/usb/uow.c b/sys/dev/usb/uow.c
index be118e7c82a..37f16d3a32f 100644
--- a/sys/dev/usb/uow.c
+++ b/sys/dev/usb/uow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uow.c,v 1.24 2007/09/02 15:59:35 grange Exp $	*/
+/*	$OpenBSD: uow.c,v 1.25 2007/10/11 18:33:15 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -120,7 +120,6 @@ uow_attach(struct device *parent, struct device *self, void *aux)
 	struct usb_attach_arg *uaa = aux;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
-	char *devinfop;
 	int ep_ibulk = -1, ep_obulk = -1, ep_intr = -1;
 	struct onewirebus_attach_args oba;
 	usbd_status error;
@@ -128,12 +127,6 @@ uow_attach(struct device *parent, struct device *self, void *aux)
 
 	sc->sc_udev = uaa->device;
 
-	/* Display device info string */
-	printf("\n");
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	/* Set USB configuration */
 	if ((error = usbd_set_config_no(sc->sc_udev,
 	    DS2490_USB_CONFIG, 0)) != 0) {
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 8dac1dacc45..ef67775f4ae 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uplcom.c,v 1.46 2007/09/14 14:37:40 deraadt Exp $	*/
+/*	$OpenBSD: uplcom.c,v 1.47 2007/10/11 18:33:15 deraadt Exp $	*/
 /*	$NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -229,17 +229,11 @@ uplcom_attach(struct device *parent, struct device *self, void *aux)
 	usb_device_descriptor_t *ddesc;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
-
-	char *devinfop;
 	char *devname = sc->sc_dev.dv_xname;
 	usbd_status err;
 	int i;
 	struct ucom_attach_args uca;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", devname, devinfop);
-	usbd_devinfo_free(devinfop);
-
         sc->sc_udev = dev;
 
 	DPRINTF(("\n\nuplcom attach: sc=%p\n", sc));
@@ -252,7 +246,7 @@ uplcom_attach(struct device *parent, struct device *self, void *aux)
 	/* Move the device into the configured state. */
 	err = usbd_set_config_index(dev, UPLCOM_CONFIG_INDEX, 1);
 	if (err) {
-		printf("\n%s: failed to set configuration, err=%s\n",
+		printf("%s: failed to set configuration, err=%s\n",
 			devname, usbd_errstr(err));
 		sc->sc_dying = 1;
 		return;
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 5c7ba840058..1bb0ea7fa00 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: urio.c,v 1.32 2007/06/14 10:11:16 mbalmer Exp $	*/
+/*	$OpenBSD: urio.c,v 1.33 2007/10/11 18:33:15 deraadt Exp $	*/
 /*	$NetBSD: urio.c,v 1.15 2002/10/23 09:14:02 jdolecek Exp $	*/
 
 /*
@@ -141,7 +141,6 @@ urio_attach(struct device *parent, struct device *self, void *aux)
 	struct usb_attach_arg	*uaa = aux;
 	usbd_device_handle	dev = uaa->device;
 	usbd_interface_handle	iface;
-	char			*devinfop;
 	usbd_status		err;
 	usb_endpoint_descriptor_t *ed;
 	u_int8_t		epcount;
@@ -149,10 +148,6 @@ urio_attach(struct device *parent, struct device *self, void *aux)
 
 	DPRINTFN(10,("urio_attach: sc=%p\n", sc));
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	err = usbd_set_config_no(dev, URIO_CONFIG_NO, 1);
 	if (err) {
 		printf("%s: setting config no failed\n",
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index d0245d6f44d..6bb4c77701b 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb_subr.c,v 1.62 2007/10/11 18:30:50 deraadt Exp $ */
+/*	$OpenBSD: usb_subr.c,v 1.63 2007/10/11 18:33:15 deraadt Exp $ */
 /*	$NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
@@ -313,7 +313,7 @@ usbd_devinfo(usbd_device_handle dev, int showclass, char *base, size_t len)
 	}
 	bcdUSB = UGETW(udd->bcdUSB);
 	bcdDevice = UGETW(udd->bcdDevice);
-	snprintf(cp, base + len - cp, ", rev ");
+	snprintf(cp, base + len - cp, " rev ");
 	cp += strlen(cp);
 	usbd_printBCD(cp, base + len - cp, bcdUSB);
 	cp += strlen(cp);
@@ -321,7 +321,7 @@ usbd_devinfo(usbd_device_handle dev, int showclass, char *base, size_t len)
 	cp += strlen(cp);
 	usbd_printBCD(cp, base + len - cp, bcdDevice);
 	cp += strlen(cp);
-	snprintf(cp, base + len - cp, ", addr %d", dev->address);
+	snprintf(cp, base + len - cp, " addr %d", dev->address);
 }
 
 char *
@@ -1173,14 +1173,17 @@ int
 usbd_print(void *aux, const char *pnp)
 {
 	struct usb_attach_arg *uaa = aux;
-	char devinfo[1024];
+	char *devinfop;
+
+	devinfop = usbd_devinfo_alloc(uaa->device, 0);
 
 	DPRINTFN(15, ("usbd_print dev=%p\n", uaa->device));
 	if (pnp) {
-		if (!uaa->usegeneric)
+		if (!uaa->usegeneric) {
+			usbd_devinfo_free(devinfop);
 			return (QUIET);
-		usbd_devinfo(uaa->device, 1, devinfo, sizeof devinfo);
-		printf("%s, %s", devinfo, pnp);
+		}
+		printf("%s, %s", devinfop, pnp);
 	}
 	if (uaa->port != 0)
 		printf(" port %d", uaa->port);
@@ -1188,19 +1191,10 @@ usbd_print(void *aux, const char *pnp)
 		printf(" configuration %d", uaa->configno);
 	if (uaa->ifaceno != UHUB_UNK_INTERFACE)
 		printf(" interface %d", uaa->ifaceno);
-#if 0
-	/*
-	 * It gets very crowded with these locators on the attach line.
-	 * They are not really needed since they are printed in the clear
-	 * by each driver.
-	 */
-	if (uaa->vendor != UHUB_UNK_VENDOR)
-		printf(" vendor 0x%04x", uaa->vendor);
-	if (uaa->product != UHUB_UNK_PRODUCT)
-		printf(" product 0x%04x", uaa->product);
-	if (uaa->release != UHUB_UNK_RELEASE)
-		printf(" release 0x%04x", uaa->release);
-#endif
+
+	/* Display device info string */
+	printf(" %s\n", devinfop);
+	usbd_devinfo_free(devinfop);
 	return (UNCONF);
 }
 
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index af9cec56f73..2894342717d 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uscanner.c,v 1.35 2007/06/14 10:11:16 mbalmer Exp $ */
+/*	$OpenBSD: uscanner.c,v 1.36 2007/10/11 18:33:15 deraadt Exp $ */
 /*	$NetBSD: uscanner.c,v 1.40 2003/01/27 00:32:44 wiz Exp $	*/
 
 /*
@@ -274,14 +274,9 @@ uscanner_attach(struct device *parent, struct device *self, void *aux)
 	struct usb_attach_arg *uaa = aux;
 	usb_interface_descriptor_t *id = 0;
 	usb_endpoint_descriptor_t *ed, *ed_bulkin = NULL, *ed_bulkout = NULL;
-	char *devinfop;
 	int i;
 	usbd_status err;
 
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	sc->sc_dev_flags = uscanner_lookup(uaa->vendor, uaa->product)->flags;
 
 	sc->sc_udev = uaa->device;
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index 5c98b95a257..647222506f2 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uslcom.c,v 1.15 2007/10/08 03:10:42 jcs Exp $	*/
+/*	$OpenBSD: uslcom.c,v 1.16 2007/10/11 18:33:15 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -168,14 +168,10 @@ uslcom_attach(struct device *parent, struct device *self, void *aux)
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	usbd_status error;
-	char *devinfop;
 	int i;
 
 	bzero(&uca, sizeof(uca));
 	sc->sc_udev = uaa->device;
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
 
 	if (usbd_set_config_index(sc->sc_udev, USLCOM_CONFIG_NO, 1) != 0) {
 		printf("%s: could not set configuration no\n",
diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c
index 084eff27d14..6e8e7b934bd 100644
--- a/sys/dev/usb/usscanner.c
+++ b/sys/dev/usb/usscanner.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usscanner.c,v 1.23 2007/09/17 01:40:38 fgsch Exp $	*/
+/*	$OpenBSD: usscanner.c,v 1.24 2007/10/11 18:33:15 deraadt Exp $	*/
 /*	$NetBSD: usscanner.c,v 1.6 2001/01/23 14:04:14 augustss Exp $	*/
 
 /*
@@ -211,7 +211,6 @@ usscanner_attach(struct device *parent, struct device *self, void *aux)
 	struct scsibus_attach_args saa;
 	usbd_device_handle	dev = uaa->device;
 	usbd_interface_handle	iface;
-	char			*devinfop;
 	usbd_status		err;
 	usb_endpoint_descriptor_t *ed;
 	u_int8_t		epcount;
@@ -219,10 +218,6 @@ usscanner_attach(struct device *parent, struct device *self, void *aux)
 
 	DPRINTFN(10,("usscanner_attach: sc=%p\n", sc));
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	err = usbd_set_config_no(dev, USSCANNER_CONFIG_NO, 1);
 	if (err) {
 		printf("%s: setting config no failed\n",
diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c
index f044075a165..35365c02b53 100644
--- a/sys/dev/usb/uts.c
+++ b/sys/dev/usb/uts.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uts.c,v 1.21 2007/09/18 19:44:40 miod Exp $ */
+/*	$OpenBSD: uts.c,v 1.22 2007/10/11 18:33:15 deraadt Exp $ */
 
 /*
  * Copyright (c) 2007 Robert Nagy <robert@openbsd.org>
@@ -151,7 +151,6 @@ uts_attach(struct device *parent, struct device *self, void *aux)
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	struct wsmousedev_attach_args a;
-	char *devinfop;
 	int i, found;
 
 	sc->sc_udev = uaa->device;
@@ -164,12 +163,6 @@ uts_attach(struct device *parent, struct device *self, void *aux)
 	/* Copy the default scalue values to each softc */
 	bcopy(&def_scale, &sc->sc_tsscale, sizeof(sc->sc_tsscale));
 
-	/* Display device info string */
-	printf("\n");
-	devinfop = usbd_devinfo_alloc(uaa->device, 0);
-	printf("%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	/* Move the device into the configured state. */
 	if (usbd_set_config_index(uaa->device, UTS_CONFIG_INDEX, 1) != 0) {
 		printf("%s: could not set configuartion no\n",
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index 3dd427d62e5..78e44cb09c6 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvisor.c,v 1.35 2007/06/14 10:11:16 mbalmer Exp $	*/
+/*	$OpenBSD: uvisor.c,v 1.36 2007/10/11 18:33:15 deraadt Exp $	*/
 /*	$NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $	*/
 
 /*
@@ -244,8 +244,6 @@ uvisor_attach(struct device *parent, struct device *self, void *aux)
 	struct uvisor_connection_info coninfo;
 	struct uvisor_palm_connection_info palmconinfo;
 	usb_endpoint_descriptor_t *ed;
-	char *devinfop;
-	char *devname = sc->sc_dev.dv_xname;
 	int i, j, hasin, hasout, port;
 	usbd_status err;
 	struct ucom_attach_args uca;
@@ -255,22 +253,18 @@ uvisor_attach(struct device *parent, struct device *self, void *aux)
 	/* Move the device into the configured state. */
 	err = usbd_set_config_index(dev, UVISOR_CONFIG_INDEX, 1);
 	if (err) {
-		printf("\n%s: failed to set configuration, err=%s\n",
-		       devname, usbd_errstr(err));
+		printf(": failed to set configuration, err=%s\n",
+		    usbd_errstr(err));
 		goto bad;
 	}
 
 	err = usbd_device2interface_handle(dev, UVISOR_IFACE_INDEX, &iface);
 	if (err) {
-		printf("\n%s: failed to get interface, err=%s\n",
-		       devname, usbd_errstr(err));
+		printf(": failed to get interface, err=%s\n",
+		    usbd_errstr(err));
 		goto bad;
 	}
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", devname, devinfop);
-	usbd_devinfo_free(devinfop);
-
 	sc->sc_flags = uvisor_lookup(uaa->vendor, uaa->product)->uv_flags;
 	sc->sc_vendor = uaa->vendor;
 	
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index bd2132ef10b..f791295526e 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvscom.c,v 1.18 2007/06/14 10:11:16 mbalmer Exp $ */
+/*	$OpenBSD: uvscom.c,v 1.19 2007/10/11 18:33:15 deraadt Exp $ */
 /*	$NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $	*/
 /*-
  * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
@@ -245,16 +245,11 @@ uvscom_attach(struct device *parent, struct device *self, void *aux)
 	usb_config_descriptor_t *cdesc;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
-	char *devinfop;
 	const char *devname = sc->sc_dev.dv_xname;
 	usbd_status err;
 	int i;
 	struct ucom_attach_args uca;
 
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", devname, devinfop);
-	usbd_devinfo_free(devinfop);
-
         sc->sc_udev = dev;
 
 	DPRINTF(("uvscom attach: sc = %p\n", sc));
diff --git a/sys/dev/usb/uyap.c b/sys/dev/usb/uyap.c
index e0804b417e1..69560347eca 100644
--- a/sys/dev/usb/uyap.c
+++ b/sys/dev/usb/uyap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uyap.c,v 1.14 2007/06/14 10:11:16 mbalmer Exp $ */
+/*	$OpenBSD: uyap.c,v 1.15 2007/10/11 18:33:15 deraadt Exp $ */
 /*	$NetBSD: uyap.c,v 1.6 2002/07/11 21:14:37 augustss Exp $	*/
 
 /*
@@ -113,11 +113,6 @@ uyap_attach(struct device *parent, struct device *self, void *aux)
 	struct uyap_softc *sc = (struct uyap_softc *)self;
 	struct usb_attach_arg *uaa = aux;
 	usbd_device_handle dev = uaa->device;
-	char *devinfop;
-
-	devinfop = usbd_devinfo_alloc(dev, 0);
-	printf("\n%s: %s\n", sc->sc_dev.dv_xname, devinfop);
-	usbd_devinfo_free(devinfop);
 
 	printf("%s: downloading firmware\n", sc->sc_dev.dv_xname);