diff options
| author | thompsa <thompsa@FreeBSD.org> | 2008-11-10 20:54:31 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2008-11-10 20:54:31 +0000 |
| commit | 33e3cbce8e605e9e2818d8d34f721a3bca2b65ff (patch) | |
| tree | 2a38bb4601a2892888db6d9b14e006bae8a41889 /sys/dev/usb2/controller/uhci2_pci.c | |
| parent | 79b0ca8da7a3f9f7743f354dfd1368f99e5c49e8 (diff) | |
| download | FreeBSD-src-33e3cbce8e605e9e2818d8d34f721a3bca2b65ff.zip FreeBSD-src-33e3cbce8e605e9e2818d8d34f721a3bca2b65ff.tar.gz | |
Convert the two main locking areas into macros to make it clear on what we are
grabbing and why. These are now:
USB_BUS_LOCK/USB_BUS_UNLOCK
USB_XFER_LOCK/USB_XFER_UNLOCK
Reviewed by: alfred
Diffstat (limited to 'sys/dev/usb2/controller/uhci2_pci.c')
| -rw-r--r-- | sys/dev/usb2/controller/uhci2_pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/usb2/controller/uhci2_pci.c b/sys/dev/usb2/controller/uhci2_pci.c index 947f9af..44e0b59 100644 --- a/sys/dev/usb2/controller/uhci2_pci.c +++ b/sys/dev/usb2/controller/uhci2_pci.c @@ -321,7 +321,7 @@ uhci_pci_attach(device_t self) break; } - err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.mtx, + err = usb2_config_td_setup(&sc->sc_config_td, sc, &sc->sc_bus.bus_mtx, NULL, 0, 4); if (err) { device_printf(self, "could not setup config thread!\n"); @@ -390,12 +390,12 @@ uhci_pci_detach(device_t self) * uhci_init. */ if (sc->sc_io_res) { - mtx_lock(&sc->sc_bus.mtx); + USB_BUS_LOCK(&sc->sc_bus); /* stop the controller */ uhci_reset(sc); - mtx_unlock(&sc->sc_bus.mtx); + USB_BUS_UNLOCK(&sc->sc_bus); } pci_disable_busmaster(self); |
