ok?

Index: onewire.c
===================================================================
RCS file: /cvs/src/sys/dev/onewire/onewire.c,v
retrieving revision 1.17
diff -u -p -r1.17 onewire.c
--- onewire.c   3 Apr 2017 16:10:00 -0000       1.17
+++ onewire.c   23 Nov 2019 00:18:24 -0000
@@ -39,7 +39,7 @@
 #endif
 
 #define ONEWIRE_MAXDEVS                16
-#define ONEWIRE_SCANTIME       3
+#define ONEWIRE_SCANTIME       SEC_TO_NSEC(3)
 
 struct onewire_softc {
        struct device                   sc_dev;
@@ -121,7 +121,7 @@ onewire_detach(struct device *self, int 
        sc->sc_dying = 1;
        if (sc->sc_thread != NULL) {
                wakeup(sc->sc_thread);
-               tsleep(&sc->sc_dying, PWAIT, "owdt", 0);
+               tsleep_nsec(&sc->sc_dying, PWAIT, "owdt", INFSLP);
        }
 
        return (config_detach_children(self, flags));
@@ -326,7 +326,7 @@ onewire_search(void *arg, u_int64_t *buf
 
        while (search && count < size) {
                /* XXX: yield processor */
-               tsleep(sc, PWAIT, "owscan", hz / 10);
+               tsleep_nsec(sc, PWAIT, "owscan", MSEC_TO_NSEC(100));
 
                /*
                 * Start new search. Go through the previous path to
@@ -400,7 +400,7 @@ onewire_thread(void *arg)
                onewire_scan(sc);
                if (sc->sc_flags & ONEWIRE_NO_PERIODIC_SCAN)
                        break;
-               tsleep(sc->sc_thread, PWAIT, "owidle", ONEWIRE_SCANTIME * hz);
+               tsleep_nsec(sc->sc_thread, PWAIT, "owidle", ONEWIRE_SCANTIME);
        }
 
        sc->sc_thread = NULL;
Index: owtemp.c
===================================================================
RCS file: /cvs/src/sys/dev/onewire/owtemp.c,v
retrieving revision 1.16
diff -u -p -r1.16 owtemp.c
--- owtemp.c    14 Sep 2014 14:17:25 -0000      1.16
+++ owtemp.c    23 Nov 2019 00:18:24 -0000
@@ -158,7 +158,7 @@ owtemp_update(void *arg)
         * at least this period.
         */
        onewire_write_byte(sc->sc_onewire, DS1920_CMD_CONVERT);
-       tsleep(sc, PRIBIO, "owtemp", hz);
+       tsleep_nsec(sc, PRIBIO, "owtemp", SEC_TO_NSEC(1));
 
        if (onewire_reset(sc->sc_onewire) != 0)
                goto done;

Reply via email to