From 387ecc9396c194d094da873274f2e673817b45bb Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sat, 9 Jun 2007 06:53:27 +0000 Subject: [PATCH] Expand USB_ATTACH_SETUP inline. Kill devinfo stuff. --- sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 5 +---- sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index 012b0f7dfb7..7727ef80ac8 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -313,16 +313,13 @@ USB_ATTACH(ubt) usb_config_descriptor_t *cd = NULL; usb_interface_descriptor_t *id = NULL; usb_endpoint_descriptor_t *ed = NULL; - char devinfo[1024]; usbd_status error; int i, ai, alt_no, isoc_in, isoc_out, isoc_isize, isoc_osize; /* Get USB device info */ + sc->sc_dev = self; sc->sc_udev = uaa->device; - usbd_devinfo(sc->sc_udev, 0, devinfo); - USB_ATTACH_SETUP; - printf("%s: %s\n", device_get_nameunit(sc->sc_dev), devinfo); /* * Initialize device softc structure diff --git a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c index 5905eda686c..a9cd67b98ab 100644 --- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c +++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c @@ -151,12 +151,9 @@ USB_ATTACH(ubtbcmfw) USB_ATTACH_START(ubtbcmfw, sc, uaa); usbd_interface_handle iface; usbd_status err; - char devinfo[1024]; + sc->sc_dev = self; sc->sc_udev = uaa->device; - usbd_devinfo(sc->sc_udev, 0, devinfo); - USB_ATTACH_SETUP; - printf("%s: %s\n", USBDEVNAME(sc->sc_dev), devinfo); sc->sc_ctrl_dev = sc->sc_intr_in_dev = sc->sc_bulk_out_dev = NULL; sc->sc_intr_in_pipe = sc->sc_bulk_out_pipe = NULL;