29c29
< __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/uhci2.c 184610 2008-11-04 02:31:03Z alfred $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb2/controller/uhci2.c 184824 2008-11-10 20:54:31Z thompsa $");
268c268
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
282c282
< usb2_pause_mtx(&sc->sc_bus.mtx,
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx,
295c295
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
311c311
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
335c335
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
358c358
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
419c419
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
616c616
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
631c631
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
651c651
< usb2_pause_mtx(&sc->sc_bus.mtx, USB_RESUME_WAIT);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, USB_RESUME_WAIT);
653c653
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
660c660
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
670c670
< usb2_pause_mtx(&sc->sc_bus.mtx,
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx,
683c683
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1451c1451
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1509c1509
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1524c1524
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
1529c1529
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1539c1539
< mtx_lock(&sc->sc_bus.mtx);
---
> USB_BUS_LOCK(&sc->sc_bus);
1542c1542
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);
1860c1860
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
2440c2440
< usb2_pause_mtx(&sc->sc_bus.mtx,
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx,
2454c2454
< usb2_pause_mtx(&sc->sc_bus.mtx, 1);
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx, 1);
2469c2469
< usb2_pause_mtx(&sc->sc_bus.mtx,
---
> usb2_pause_mtx(&sc->sc_bus.bus_mtx,
2563c2563
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
2579c2579
< use_polling = mtx_owned(xfer->priv_mtx) ? 1 : 0;
---
> use_polling = mtx_owned(xfer->xfer_mtx) ? 1 : 0;
2916c2916
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
2944c2944
< mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
---
> USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
2963c2963
< mtx_unlock(&sc->sc_bus.mtx);
---
> USB_BUS_UNLOCK(&sc->sc_bus);