diff options
| author |   cheloha <cheloha@openbsd.org> | 2019-10-07 22:40:35 +0000 |
|---|---|---|
| committer | cheloha <cheloha@openbsd.org> | 2019-10-07 22:40:35 +0000 |
| commit | d7ed0b3d29e2e52983bd03edad00247b04d2227e (patch) | |
| tree | 0c27ba2581c249b68051fb3ec51be6c2a4f8111e | |
| parent | jmc is a stickler for consistency. (diff) | |
| download | wireguard-openbsd-d7ed0b3d29e2e52983bd03edad00247b04d2227e.tar.xz wireguard-openbsd-d7ed0b3d29e2e52983bd03edad00247b04d2227e.zip | |
octmmc(4): msleep(9) -> msleep_nsec(9); ok visa@ kn@
| -rw-r--r-- | sys/arch/octeon/dev/octmmc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/octeon/dev/octmmc.c b/sys/arch/octeon/dev/octmmc.c index b013e46275d..cb9c5de69a7 100644 --- a/sys/arch/octeon/dev/octmmc.c +++ b/sys/arch/octeon/dev/octmmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: octmmc.c,v 1.13 2019/01/13 16:45:44 visa Exp $ */ +/* $OpenBSD: octmmc.c,v 1.14 2019/10/07 22:40:35 cheloha Exp $ */ /* * Copyright (c) 2016, 2017 Visa Hankala @@ -965,7 +965,7 @@ octmmc_get_response(struct octmmc_softc *sc, struct sdmmc_command *cmd) } int -octmmc_wait_intr(struct octmmc_softc *sc, uint64_t mask, int timeout) +octmmc_wait_intr(struct octmmc_softc *sc, uint64_t mask, int secs) { MUTEX_ASSERT_LOCKED(&sc->sc_intr_mtx); @@ -973,8 +973,8 @@ octmmc_wait_intr(struct octmmc_softc *sc, uint64_t mask, int timeout) sc->sc_intr_status = 0; while ((sc->sc_intr_status & mask) == 0) { - if (msleep(&sc->sc_intr_status, &sc->sc_intr_mtx, PWAIT, - "hcintr", timeout * hz) == EWOULDBLOCK) + if (msleep_nsec(&sc->sc_intr_status, &sc->sc_intr_mtx, PWAIT, + "hcintr", SEC_TO_NSEC(secs)) == EWOULDBLOCK) return ETIMEDOUT; } return 0; |