diff options
| author |   mpi <mpi@openbsd.org> | 2019-10-06 17:30:00 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2019-10-06 17:30:00 +0000 |
| commit | 29a2b068f14b363dc652a142015f6f0377acfbfa (patch) | |
| tree | 5e1ce5dff60e44b8c857ac81bb66b96b9d5059d4 /sys/dev/usb/xhci.c | |
| parent | tsleep(9) to tsleep_nsec(9) conversion (diff) | |
| download | wireguard-openbsd-29a2b068f14b363dc652a142015f6f0377acfbfa.tar.xz wireguard-openbsd-29a2b068f14b363dc652a142015f6f0377acfbfa.zip | |
Use MSEC_TO_NSEC() to define XHCI_CMD_TIMEOUT & use it w/ tsleep_nsec(9).
ok visa@, kn@
Diffstat (limited to 'sys/dev/usb/xhci.c')
| -rw-r--r-- | sys/dev/usb/xhci.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c index 761ca42c6ea..f9d7eb3a401 100644 --- a/sys/dev/usb/xhci.c +++ b/sys/dev/usb/xhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xhci.c,v 1.105 2019/06/13 21:03:48 mpi Exp $ */ +/* $OpenBSD: xhci.c,v 1.106 2019/10/06 17:30:00 mpi Exp $ */ /* * Copyright (c) 2014-2015 Martin Pieuchot @@ -1804,8 +1804,7 @@ xhci_command_submit(struct xhci_softc *sc, struct xhci_trb *trb0, int timeout) s = splusb(); sc->sc_cmd_trb = trb; XDWRITE4(sc, XHCI_DOORBELL(0), 0); - error = tsleep(&sc->sc_cmd_trb, PZERO, "xhcicmd", - (timeout*hz+999)/ 1000 + 1); + error = tsleep_nsec(&sc->sc_cmd_trb, PZERO, "xhcicmd", timeout); if (error) { #ifdef XHCI_DEBUG printf("%s: tsleep() = %d\n", __func__, error); @@ -2219,7 +2218,7 @@ xhci_abort_xfer(struct usbd_xfer *xfer, usbd_status status) */ xhci_cmd_set_tr_deq_async(sc, xp->slot, xp->dci, DEQPTR(xp->ring) | xp->ring.toggle); - error = tsleep(xp, PZERO, "xhciab", (XHCI_CMD_TIMEOUT*hz+999)/1000 + 1); + error = tsleep_nsec(xp, PZERO, "xhciab", XHCI_CMD_TIMEOUT); if (error) printf("%s: timeout aborting transfer\n", DEVNAME(sc)); } |