ok?
Index: lom.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/dev/lom.c,v
retrieving revision 1.26
diff -u -p -r1.26 lom.c
--- lom.c 5 Oct 2017 22:40:08 -0000 1.26
+++ lom.c 8 Oct 2019 13:25:36 -0000
@@ -431,7 +431,7 @@ lom1_read(struct lom_softc *sc, uint8_t
lc.lc_data = 0xff;
lom1_queue_cmd(sc, &lc);
- error = tsleep(&lc, PZERO, "lomrd", hz);
+ error = tsleep_nsec(&lc, PZERO, "lomrd", SEC_TO_NSEC(1));
if (error)
lom_dequeue_cmd(sc, &lc);
@@ -453,7 +453,7 @@ lom1_write(struct lom_softc *sc, uint8_t
lc.lc_data = val;
lom1_queue_cmd(sc, &lc);
- error = tsleep(&lc, PZERO, "lomwr", 2 * hz);
+ error = tsleep_nsec(&lc, PZERO, "lomwr", SEC_TO_NSEC(2));
if (error)
lom_dequeue_cmd(sc, &lc);
@@ -619,7 +619,7 @@ lom2_read(struct lom_softc *sc, uint8_t
lc.lc_data = 0xff;
lom2_queue_cmd(sc, &lc);
- error = tsleep(&lc, PZERO, "lom2rd", hz);
+ error = tsleep_nsec(&lc, PZERO, "lom2rd", SEC_TO_NSEC(1));
if (error)
lom_dequeue_cmd(sc, &lc);
@@ -673,7 +673,7 @@ lom2_write(struct lom_softc *sc, uint8_t
lc.lc_data = val;
lom2_queue_cmd(sc, &lc);
- error = tsleep(&lc, PZERO, "lom2wr", hz);
+ error = tsleep_nsec(&lc, PZERO, "lom2wr", SEC_TO_NSEC(1));
if (error)
lom_dequeue_cmd(sc, &lc);
Index: sab.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/dev/sab.c,v
retrieving revision 1.36
diff -u -p -r1.36 sab.c
--- sab.c 19 Jul 2019 00:17:15 -0000 1.36
+++ sab.c 8 Oct 2019 13:25:36 -0000
@@ -750,7 +750,7 @@ sabttyopen(dev, flags, mode, p)
if (tp->t_cflag & HUPCL) {
sabtty_mdmctrl(sc, 0, DMSET);
- (void)tsleep(sc, TTIPRI, ttclos, hz);
+ tsleep_nsec(sc, TTIPRI, ttclos, SEC_TO_NSEC(1));
}
if ((sc->sc_flags & (SABTTYF_CONS_IN | SABTTYF_CONS_OUT)) == 0)
{
@@ -782,14 +782,14 @@ sabttyclose(dev, flags, mode, p)
sc->sc_imr1 &= ~SAB_IMR1_ALLS;
SAB_WRITE(sc, SAB_IMR1, sc->sc_imr1);
sc->sc_flags |= SABTTYF_TXDRAIN;
- (void)tsleep(sc, TTIPRI, ttclos, 5 * hz);
+ tsleep_nsec(sc, TTIPRI, ttclos, SEC_TO_NSEC(5));
sc->sc_imr1 |= SAB_IMR1_ALLS;
SAB_WRITE(sc, SAB_IMR1, sc->sc_imr1);
sc->sc_flags &= ~SABTTYF_TXDRAIN;
if (tp->t_cflag & HUPCL) {
sabtty_mdmctrl(sc, 0, DMSET);
- (void)tsleep(bc, TTIPRI, ttclos, hz);
+ tsleep_nsec(bc, TTIPRI, ttclos, SEC_TO_NSEC(1));
}
if ((sc->sc_flags & (SABTTYF_CONS_IN | SABTTYF_CONS_OUT)) == 0)
{
Index: vldcp.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/dev/vldcp.c,v
retrieving revision 1.17
diff -u -p -r1.17 vldcp.c
--- vldcp.c 22 Mar 2018 11:24:27 -0000 1.17
+++ vldcp.c 8 Oct 2019 13:25:36 -0000
@@ -398,7 +398,7 @@ retry:
if (rx_head == rx_tail) {
cbus_intr_setenabled(sc->sc_bustag, sc->sc_rx_ino,
INTR_ENABLED);
- ret = tsleep(lc->lc_rxq, PWAIT | PCATCH, "hvrd", 0);
+ ret = tsleep_nsec(lc->lc_rxq, PWAIT | PCATCH, "hvrd", INFSLP);
if (ret) {
splx(s);
device_unref(&sc->sc_dv);
@@ -464,7 +464,7 @@ retry:
if (tx_head == next_tx_tail) {
cbus_intr_setenabled(sc->sc_bustag, sc->sc_tx_ino,
INTR_ENABLED);
- ret = tsleep(lc->lc_txq, PWAIT | PCATCH, "hvwr", 0);
+ ret = tsleep_nsec(lc->lc_txq, PWAIT | PCATCH, "hvwr", INFSLP);
if (ret) {
splx(s);
device_unref(&sc->sc_dv);
