From owner-p4-projects@FreeBSD.ORG  Fri Nov 30 23:08:13 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A097C16A421; Fri, 30 Nov 2007 23:08:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6656B16A417
	for <perforce@FreeBSD.org>; Fri, 30 Nov 2007 23:08:13 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 57D6813C461
	for <perforce@FreeBSD.org>; Fri, 30 Nov 2007 23:08:13 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAUN8D6j024366
	for <perforce@FreeBSD.org>; Fri, 30 Nov 2007 23:08:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAUN8DUG024363
	for perforce@freebsd.org; Fri, 30 Nov 2007 23:08:13 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 30 Nov 2007 23:08:13 GMT
Message-Id: <200711302308.lAUN8DUG024363@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 129850 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Nov 2007 23:08:13 -0000

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

Change 129850 by hselasky@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 {