PERFORCE change 129850 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=129850

Change 129850 by hselasky at hselasky_laptop001 on 2007/11/30 23:07:59

	
	Get "__usb_attach" out of the system name domain.
	
	sed -e "s/__usb_attach/usb_attach_sub/g" usb.c

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb.c#23 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb.c#23 (text+ko) ====

@@ -96,7 +96,7 @@
 static void usb_discover(struct usbd_bus *bus);
 static void usb_event_thread(struct usbd_bus *bus);
 static void usb_create_event_thread(struct usbd_bus *bus);
-static void __usb_attach(device_t dev, struct usbd_bus *bus);
+static void usb_attach_sub(device_t dev, struct usbd_bus *bus);
 static void usb_post_init(void *arg);
 static struct usbd_clone *usb_clone_sub(struct usbd_bus *bus);
 static void usb_clone_remove(struct usbd_bus *bus);
@@ -299,7 +299,7 @@
 }
 
 static void
-__usb_attach(device_t dev, struct usbd_bus *bus)
+usb_attach_sub(device_t dev, struct usbd_bus *bus)
 {
 	dev_clone_fn usb_clone_ptr = &usb_clone;
 	usbd_status err;
@@ -387,7 +387,7 @@
 	mtx_lock(&usb_global_lock);
 
 	if (usb_post_init_called != 0) {
-		__usb_attach(dev, bus);
+		usb_attach_sub(dev, bus);
 	}
 	mtx_unlock(&usb_global_lock);
 
@@ -414,7 +414,7 @@
 			if (dev) {
 				bus = device_get_softc(dev);
 
-				__usb_attach(dev, bus);
+				usb_attach_sub(dev, bus);
 			}
 		}
 	} else {