1c1
< /* $FreeBSD: head/sys/dev/usb2/controller/uss820dci.c 184610 2008-11-04 02:31:03Z alfred $ */
---
> /* $FreeBSD: head/sys/dev/usb2/controller/uss820dci.c 184824 2008-11-10 20:54:31Z thompsa $ */
238c238
< mtx_assert(&udev->bus->mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED);
758c758
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
829c829
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
996c996
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1001c1001
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1081c1081
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1218c1218
< mtx_assert(xfer->usb2_mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(xfer->udev->bus, MA_OWNED);
1241c1241
< mtx_assert(&udev->bus->mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED);
1327c1327
< mtx_assert(&udev->bus->mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED);
1364c1364
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1383c1383
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1394c1394
< usb2_pause_mtx(&sc->sc_bus.mtx, 10);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 10);
1400c1400
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1506c1506
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1520c1520
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1535c1535
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1557c1557
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1560c1560
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1922c1922
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1938c1938
< use_polling = mtx_owned(xfer->priv_mtx) ? 1 : 0;
---
> use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0;