Fix usb2_find_descriptor function name.

4 files changed, 7 insertions, 7 deletions

diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index 5083c8711306..624760b18306 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -243,7 +243,7 @@ cdce_attach(device_t dev)
 		sc->sc_data_iface_no = 0;	/* not used */
 		goto alloc_transfers;
 	}
-	ud = usb2_find_descriptor
+	ud = usbd_find_descriptor
 	    (uaa->device, NULL, uaa->info.bIfaceIndex,
 	    UDESC_CS_INTERFACE, 0 - 1, UDESCSUB_CDC_UNION, 0 - 1);
 
@@ -319,7 +319,7 @@ alloc_transfers:
 		}
 	}
 
-	ued = usb2_find_descriptor
+	ued = usbd_find_descriptor
 	    (uaa->device, NULL, uaa->info.bIfaceIndex,
 	    UDESC_CS_INTERFACE, 0 - 1, UDESCSUB_CDC_ENF, 0 - 1);
 
diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c
index 13cdeea7ed95..e409d07e8ab2 100644
--- a/sys/dev/usb/serial/umodem.c
+++ b/sys/dev/usb/serial/umodem.c
@@ -289,7 +289,7 @@ umodem_attach(device_t dev)
 
 	if ((cmd == NULL) || (cmd->bLength < sizeof(*cmd))) {
 
-		cud = usb2_find_descriptor(uaa->device, NULL,
+		cud = usbd_find_descriptor(uaa->device, NULL,
 		    uaa->info.bIfaceIndex, UDESC_CS_INTERFACE,
 		    0 - 1, UDESCSUB_CDC_UNION, 0 - 1);
 
@@ -746,7 +746,7 @@ tr_setup:
 static void *
 umodem_get_desc(struct usb_attach_arg *uaa, uint8_t type, uint8_t subtype)
 {
-	return (usb2_find_descriptor(uaa->device, NULL, uaa->info.bIfaceIndex,
+	return (usbd_find_descriptor(uaa->device, NULL, uaa->info.bIfaceIndex,
 	    type, 0 - 1, subtype, 0 - 1));
 }
 
diff --git a/sys/dev/usb/usb_device.c b/sys/dev/usb/usb_device.c
index fd7a5af2db5d..d919d3a6e35d 100644
--- a/sys/dev/usb/usb_device.c
+++ b/sys/dev/usb/usb_device.c
@@ -2017,7 +2017,7 @@ usbd_get_iface(struct usb_device *udev, uint8_t iface_index)
 }
 
 /*------------------------------------------------------------------------*
- *	usb2_find_descriptor
+ *	usbd_find_descriptor
  *
  * This function will lookup the first descriptor that matches the
  * criteria given by the arguments "type" and "subtype". Descriptors
@@ -2032,7 +2032,7 @@ usbd_get_iface(struct usb_device *udev, uint8_t iface_index)
  *   Else: A descriptor matching the criteria
  *------------------------------------------------------------------------*/
 void   *
-usb2_find_descriptor(struct usb_device *udev, void *id, uint8_t iface_index,
+usbd_find_descriptor(struct usb_device *udev, void *id, uint8_t iface_index,
     uint8_t type, uint8_t type_mask,
     uint8_t subtype, uint8_t subtype_mask)
 {
diff --git a/sys/dev/usb/usb_device.h b/sys/dev/usb/usb_device.h
index f3ca33498fee..9a3bc2325304 100644
--- a/sys/dev/usb/usb_device.h
+++ b/sys/dev/usb/usb_device.h
@@ -247,7 +247,7 @@ usb_error_t	usb_suspend_resume(struct usb_device *udev,
 		    uint8_t do_suspend);
 void	usb_devinfo(struct usb_device *udev, char *dst_ptr, uint16_t dst_len);
 void	usb_free_device(struct usb_device *, uint8_t);
-void	*usb2_find_descriptor(struct usb_device *udev, void *id,
+void	*usbd_find_descriptor(struct usb_device *udev, void *id,
 	    uint8_t iface_index, uint8_t type, uint8_t type_mask,
 	    uint8_t subtype, uint8_t subtype_mask);
 void	usb_linux_free_device(struct usb_device *dev);