PERFORCE change 130004 for review

[Hans Petter Selasky]

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

Change 130004 by hselasky at hselasky_laptop001 on 2007/12/02 12:43:01

	
	Factor out initialization and destruction of the USB lock.

Affected files ...

.. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#28 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#28 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#63 edit

Differences ...

==== //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#10 (text) ====

@@ -84,9 +84,6 @@
 	sc->iclk = at91_pmc_clock_ref("ohci_clk");
 	sc->fclk = at91_pmc_clock_ref("uhpck");
 
-	mtx_init(&(sc->sc_ohci.sc_bus.mtx), "usb lock",
-	    NULL, MTX_DEF | MTX_RECURSE);
-
 	sc->sc_ohci.sc_dev = dev;
 
 	rid = MEM_RID;
@@ -204,8 +201,6 @@
 
 	usbd_bus_mem_free_all(&(sc->sc_bus), &ohci_iterate_hw_softc);
 
-	mtx_destroy(&(sc->sc_ohci.sc_bus.mtx));
-
 	return (0);
 }
 

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

@@ -224,9 +224,6 @@
 	if (usbd_bus_mem_alloc_all(&(sc->sc_bus), &ehci_iterate_hw_softc)) {
 		return ENOMEM;
 	}
-	mtx_init(&sc->sc_bus.mtx, "usb lock",
-	    NULL, MTX_DEF | MTX_RECURSE);
-
 	sc->sc_dev = self;
 
 	pci_enable_busmaster(self);
@@ -407,8 +404,6 @@
 
 	usbd_bus_mem_free_all(&(sc->sc_bus), &ehci_iterate_hw_softc);
 
-	mtx_destroy(&sc->sc_bus.mtx);
-
 	return (0);
 }
 

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

@@ -205,9 +205,6 @@
 	if (usbd_bus_mem_alloc_all(&(sc->sc_bus), &ohci_iterate_hw_softc)) {
 		return ENOMEM;
 	}
-	mtx_init(&sc->sc_bus.mtx, "usb lock",
-	    NULL, MTX_DEF | MTX_RECURSE);
-
 	sc->sc_dev = self;
 
 	pci_enable_busmaster(self);
@@ -364,8 +361,6 @@
 
 	usbd_bus_mem_free_all(&(sc->sc_bus), &ohci_iterate_hw_softc);
 
-	mtx_destroy(&sc->sc_bus.mtx);
-
 	return (0);
 }
 

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

@@ -221,9 +221,6 @@
 	if (usbd_bus_mem_alloc_all(&(sc->sc_bus), &uhci_iterate_hw_softc)) {
 		return ENOMEM;
 	}
-	mtx_init(&sc->sc_bus.mtx, "usb lock",
-	    NULL, MTX_DEF | MTX_RECURSE);
-
 	sc->sc_dev = self;
 
 	pci_enable_busmaster(self);
@@ -390,8 +387,6 @@
 
 	usbd_bus_mem_free_all(&(sc->sc_bus), &uhci_iterate_hw_softc);
 
-	mtx_destroy(&sc->sc_bus.mtx);
-
 	return (0);
 }
 

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

@@ -2922,6 +2922,9 @@
 {
 	bus->alloc_failed = 0;
 
+	mtx_init(&(bus->mtx), "USB lock",
+	    NULL, MTX_DEF | MTX_RECURSE);
+
 	cb(bus, &usbd_bus_mem_alloc_all_cb);
 
 	if (bus->alloc_failed) {
@@ -2951,6 +2954,8 @@
 
 	usbd_dma_tag_unsetup(bus->dma_tags, USB_BUS_DMA_TAG_MAX);
 
+	mtx_destroy(&(bus->mtx));
+
 	return;
 }