diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2020-01-13 13:32:18 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2020-01-13 13:32:18 +0000 |
| commit | 3092b4cba878fa45a2d5e4dec1ed30daf578c7cc (patch) | |
| tree | f907fa5e5ea529beabf21b9f8637b2ff63f4687c /sys | |
| parent | f3504752f635c37acaac9bb1ebbcc327d43ba5e2 (diff) | |
Convert to tsleep_nsec(9), while here fix a bug where the value specified
in ticks was meant to be in msecs.
Pointed out by and ok patrick@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/armv7/omap/ti_iic.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/arch/armv7/omap/ti_iic.c b/sys/arch/armv7/omap/ti_iic.c index 84d1891cf6a..e21de45a767 100644 --- a/sys/arch/armv7/omap/ti_iic.c +++ b/sys/arch/armv7/omap/ti_iic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ti_iic.c,v 1.11 2019/05/06 03:45:58 mlarkin Exp $ */ +/* $OpenBSD: ti_iic.c,v 1.12 2020/01/13 13:32:17 mpi Exp $ */ /* $NetBSD: ti_iic.c,v 1.4 2013/04/25 13:04:27 rkujawa Exp $ */ /* @@ -416,8 +416,8 @@ ti_iic_op(struct ti_iic_softc *sc, i2c_addr_t addr, ti_i2cop_t op, /* and wait for completion */ DPRINTF(("ti_iic_op waiting, op %#x\n", sc->sc_op)); while (sc->sc_op == op) { - if (tsleep(&sc->sc_dev, PWAIT, "tiiic", 500) - == EWOULDBLOCK) { + if (tsleep_nsec(&sc->sc_dev, PWAIT, "tiiic", + SEC_TO_NSEC(5)) == EWOULDBLOCK) { /* timeout */ op = TI_I2CERROR; } @@ -542,7 +542,8 @@ ti_iic_wait(struct ti_iic_softc *sc, uint16_t mask, uint16_t val, int flags) if (flags & I2C_F_POLL) delay(50000); else - tsleep(&sc->sc_dev, PWAIT, "tiiic", 50); + tsleep_nsec(&sc->sc_dev, PWAIT, "tiiic", + MSEC_TO_NSEC(50)); } DPRINTF(("ti_iic_wait done retry %#x\n", retry)); |