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

[Andrew Thompson]

Author: thompsa
Date: Sun Apr  5 18:19:10 2009
New Revision: 190726
URL: http://svn.freebsd.org/changeset/base/190726

Log:
  MFp4 //depot/projects/usb at 159806
  
  Properly name usb2_uref_location() so that it is not confused with
  usb2_unref_location() .
  
  Submitted by:	Hans Petter Selasky

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

Modified: head/sys/dev/usb/usb_dev.c
==============================================================================
--- head/sys/dev/usb/usb_dev.c	Sun Apr  5 18:19:00 2009	(r190725)
+++ head/sys/dev/usb/usb_dev.c	Sun Apr  5 18:19:10 2009	(r190726)
@@ -89,7 +89,7 @@ static void	usb2_loc_fill(struct usb2_fs
 		    struct usb2_cdev_privdata *);
 static void	usb2_close(void *);
 static usb2_error_t usb2_ref_device(struct usb2_cdev_privdata *, int);
-static usb2_error_t usb2_uref_location(struct usb2_cdev_privdata *);
+static usb2_error_t usb2_usb_ref_location(struct usb2_cdev_privdata *);
 static void	usb2_unref_device(struct usb2_cdev_privdata *);
 
 static d_open_t usb2_open;
@@ -264,7 +264,7 @@ error:
 }
 
 /*------------------------------------------------------------------------*
- *	usb2_uref_location
+ *	usb2_usb_ref_location
  *
  * This function is used to upgrade an USB reference to include the
  * USB device reference on a USB location.
@@ -274,7 +274,7 @@ error:
  *  Else: Failure.
  *------------------------------------------------------------------------*/
 static usb2_error_t
-usb2_uref_location(struct usb2_cdev_privdata *cpd)
+usb2_usb_ref_location(struct usb2_cdev_privdata *cpd)
 {
 	/*
 	 * Check if we already got an USB reference on this location:
@@ -1038,7 +1038,7 @@ usb2_ioctl(struct cdev *dev, u_long cmd,
 		err = (f->methods->f_ioctl) (f, cmd, addr, fflags);
 		DPRINTFN(2, "f_ioctl cmd 0x%lx = %d\n", cmd, err);
 		if (err == ENOIOCTL) {
-			if (usb2_uref_location(cpd)) {
+			if (usb2_usb_ref_location(cpd)) {
 				err = ENXIO;
 				goto done;
 			}