2c2
< __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/at91dci.c 184610 2008-11-04 02:31:03Z alfred $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/at91dci.c 184824 2008-11-10 20:54:31Z thompsa $");
294c294
< mtx_assert(&udev->bus->mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED);
769c769
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
794c794
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
804c804
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
810c810
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
882c882
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1068c1068
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1073c1073
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1118c1118
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1258c1258
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1284c1284
< mtx_assert(&udev->bus->mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED);
1408c1408
< mtx_assert(&udev->bus->mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED);
1441c1441
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1449c1449
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
1486c1486
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1498c1498
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1513c1513
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1535c1535
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1538c1538
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1900c1900
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1916c1916
< use_polling = mtx_owned(xfer->priv_mtx) ? 1 : 0;
---
> use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0;