This convert tsleep(9) calls that wait for a multiple of `hz' in dev/usb.
Ok?
Index: if_athn_usb.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_athn_usb.c,v
retrieving revision 1.53
diff -u -p -r1.53 if_athn_usb.c
--- if_athn_usb.c 12 Sep 2019 12:55:07 -0000 1.53
+++ if_athn_usb.c 10 Nov 2019 17:13:13 -0000
@@ -694,7 +694,8 @@ athn_usb_load_firmware(struct athn_usb_s
error = usbd_do_request(usc->sc_udev, &req, NULL);
/* Wait at most 1 second for firmware to boot. */
if (error == 0 && usc->wait_msg_id != 0)
- error = tsleep(&usc->wait_msg_id, 0, "athnfw", hz);
+ error = tsleep_nsec(&usc->wait_msg_id, 0, "athnfw",
+ SEC_TO_NSEC(1));
usc->wait_msg_id = 0;
splx(s);
return (error);
@@ -779,7 +780,8 @@ athn_usb_htc_setup(struct athn_usb_softc
usc->wait_msg_id = AR_HTC_MSG_CONF_PIPE_RSP;
error = athn_usb_htc_msg(usc, AR_HTC_MSG_CONF_PIPE, &cfg, sizeof(cfg));
if (error == 0 && usc->wait_msg_id != 0)
- error = tsleep(&usc->wait_msg_id, 0, "athnhtc", hz);
+ error = tsleep_nsec(&usc->wait_msg_id, 0, "athnhtc",
+ SEC_TO_NSEC(1));
usc->wait_msg_id = 0;
splx(s);
if (error != 0) {
@@ -815,7 +817,8 @@ athn_usb_htc_connect_svc(struct athn_usb
error = athn_usb_htc_msg(usc, AR_HTC_MSG_CONN_SVC, &msg, sizeof(msg));
/* Wait at most 1 second for response. */
if (error == 0 && usc->wait_msg_id != 0)
- error = tsleep(&usc->wait_msg_id, 0, "athnhtc", hz);
+ error = tsleep_nsec(&usc->wait_msg_id, 0, "athnhtc",
+ SEC_TO_NSEC(1));
usc->wait_msg_id = 0;
splx(s);
if (error != 0) {
Index: if_otus.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_otus.c,v
retrieving revision 1.64
diff -u -p -r1.64 if_otus.c
--- if_otus.c 12 Sep 2019 12:55:07 -0000 1.64
+++ if_otus.c 10 Nov 2019 17:11:21 -0000
@@ -849,7 +849,7 @@ otus_cmd(struct otus_softc *sc, uint8_t
return EIO;
}
if (!cmd->done)
- error = tsleep(cmd, PCATCH, "otuscmd", hz);
+ error = tsleep_nsec(cmd, PCATCH, "otuscmd", SEC_TO_NSEC(1));
cmd->odata = NULL; /* In case answer is received too late. */
splx(s);
if (error != 0) {
Index: if_uath.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_uath.c,v
retrieving revision 1.83
diff -u -p -r1.83 if_uath.c
--- if_uath.c 25 Apr 2019 01:52:14 -0000 1.83
+++ if_uath.c 10 Nov 2019 17:10:41 -0000
@@ -981,7 +981,7 @@ uath_cmd(struct uath_softc *sc, uint32_t
return 0; /* write: don't wait for reply */
/* wait at most two seconds for command reply */
- error = tsleep(cmd, PCATCH, "uathcmd", 2 * hz);
+ error = tsleep_nsec(cmd, PCATCH, "uathcmd", SEC_TO_NSEC(2));
cmd->odata = NULL; /* in case answer is received too late */
splx(s);
if (error != 0) {
@@ -1609,7 +1609,8 @@ uath_reset(struct uath_softc *sc)
UATH_CMD_FLAG_ASYNC);
/* ..and wait until firmware notifies us that it is ready */
if (error == 0)
- error = tsleep(UATH_COND_INIT(sc), PCATCH, "uathinit", 5 * hz);
+ error = tsleep_nsec(UATH_COND_INIT(sc), PCATCH, "uathinit",
+ SEC_TO_NSEC(5));
splx(s);
if (error != 0)
return error;
Index: if_wi_usb.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/if_wi_usb.c,v
retrieving revision 1.69
diff -u -p -r1.69 if_wi_usb.c
--- if_wi_usb.c 10 Nov 2018 15:28:05 -0000 1.69
+++ if_wi_usb.c 10 Nov 2019 17:10:01 -0000
@@ -1032,7 +1032,7 @@ wi_usb_do_transmit_sync(struct wi_usb_so
err = EIO;
goto done;
}
- err = tsleep(ident, PRIBIO, "wiTXsync", hz*1);
+ err = tsleep_nsec(ident, PRIBIO, "wiTXsync", SEC_TO_NSEC(1));
if (err) {
DPRINTFN(1,("%s: %s: err %x\n",
sc->wi_usb_dev.dv_xname, __func__, err));
Index: ucom.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/ucom.c,v
retrieving revision 1.68
diff -u -p -r1.68 ucom.c
--- ucom.c 19 Jul 2019 00:17:15 -0000 1.68
+++ ucom.c 10 Nov 2019 17:09:47 -0000
@@ -291,7 +291,7 @@ ucom_shutdown(struct ucom_softc *sc)
*/
if (ISSET(tp->t_cflag, HUPCL)) {
ucom_dtr(sc, 0);
- (void)tsleep(sc, TTIPRI, ttclos, hz);
+ (void)tsleep_nsec(sc, TTIPRI, ttclos, SEC_TO_NSEC(1));
}
}
Index: utrh.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/utrh.c,v
retrieving revision 1.21
diff -u -p -r1.21 utrh.c
--- utrh.c 8 Apr 2017 02:57:25 -0000 1.21
+++ utrh.c 10 Nov 2019 17:06:56 -0000
@@ -221,7 +221,7 @@ utrh_refresh(void *arg)
return;
/* wait till sensor data are updated, 1s will be enough */
- tsleep(&sc->sc_sensortask, 0, "utrh", (1*hz));
+ tsleep_nsec(&sc->sc_sensortask, 0, "utrh", SEC_TO_NSEC(1));
/* turn off LED 1 */
ledbuf[1] = 0x0;
Index: uvscom.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/uvscom.c,v
retrieving revision 1.37
diff -u -p -r1.37 uvscom.c
--- uvscom.c 27 Apr 2018 08:08:06 -0000 1.37
+++ uvscom.c 10 Nov 2019 17:06:10 -0000
@@ -706,7 +706,7 @@ uvscom_open(void *addr, int portno)
/* unit is not ready */
for (i = UVSCOM_UNIT_WAIT; i > 0; --i) {
- tsleep(&err, TTIPRI, "uvsop", hz); /* XXX */
+ tsleep_nsec(&err, TTIPRI, "uvsop", SEC_TO_NSEC(1));
if (ISSET(sc->sc_usr, UVSCOM_USTAT_MASK))
break;
}
