svn commit: r329454 - head/sys/dev/usb

[Hans Petter Selasky]

Author: hselasky
Date: Sat Feb 17 12:38:46 2018
New Revision: 329454
URL: https://svnweb.freebsd.org/changeset/base/329454

Log:
  Revert redundant parts of r329440 after recent devmatch(8) changes.
  
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/dev/usb/usb_hub.c

Modified: head/sys/dev/usb/usb_hub.c
==============================================================================
--- head/sys/dev/usb/usb_hub.c	Sat Feb 17 12:32:53 2018	(r329453)
+++ head/sys/dev/usb/usb_hub.c	Sat Feb 17 12:38:46 2018	(r329454)
@@ -1733,12 +1733,7 @@ uhub_child_pnpinfo_string(device_t parent, device_t ch
 	}
 	iface = usbd_get_iface(res.udev, res.iface_index);
 	if (iface && iface->idesc) {
-		snprintf(buf, buflen,
-		    "bus=usb "
-#if USB_HAVE_UGEN
-		    "device=%s "
-#endif
-		    "vendor=0x%04x product=0x%04x "
+		snprintf(buf, buflen, "vendor=0x%04x product=0x%04x "
 		    "devclass=0x%02x devsubclass=0x%02x "
 		    "devproto=0x%02x "
 		    "sernum=\"%s\" "
@@ -1746,9 +1741,6 @@ uhub_child_pnpinfo_string(device_t parent, device_t ch
 		    "mode=%s "
 		    "intclass=0x%02x intsubclass=0x%02x "
 		    "intprotocol=0x%02x" "%s%s",
-#if USB_HAVE_UGEN
-		    res.udev->ugen_name,
-#endif
 		    UGETW(res.udev->ddesc.idVendor),
 		    UGETW(res.udev->ddesc.idProduct),
 		    res.udev->ddesc.bDeviceClass,