summaryrefslogtreecommitdiff
path: root/sys/dev/isa
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2019-12-31 10:05:34 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2019-12-31 10:05:34 +0000
commit9342e91df4a806cfd8bdf1bdabd73eab5c7a56db (patch)
tree5e831ba5086ad8aadd757e8497ff9fd18e72b601 /sys/dev/isa
parent6716328d3f8e7e5092b5ad41628a56775d32e1be (diff)
Convert infinite sleeps to {m,t}sleep_nsec(9).
ok kn@
Diffstat (limited to 'sys/dev/isa')
-rw-r--r--sys/dev/isa/pcppi.c5
-rw-r--r--sys/dev/isa/sbdsp.c4
-rw-r--r--sys/dev/isa/wds.c4
3 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c
index 46faf991290..e6ac09a4a59 100644
--- a/sys/dev/isa/pcppi.c
+++ b/sys/dev/isa/pcppi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcppi.c,v 1.14 2019/02/20 07:00:31 anton Exp $ */
+/* $OpenBSD: pcppi.c,v 1.15 2019/12/31 10:05:32 mpi Exp $ */
/* $NetBSD: pcppi.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */
/*
@@ -243,7 +243,8 @@ pcppi_bell(self, pitch, period, slp)
timeout_add(&sc->sc_bell_timeout, period);
if (slp & PCPPI_BELL_SLEEP) {
sc->sc_slp = 1;
- tsleep(pcppi_bell_stop, PCPPIPRI | PCATCH, "bell", 0);
+ tsleep_nsec(pcppi_bell_stop, PCPPIPRI | PCATCH, "bell",
+ INFSLP);
sc->sc_slp = 0;
}
}
diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index 52da66da3cc..d40ca5bf188 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbdsp.c,v 1.37 2016/09/14 06:12:19 ratchov Exp $ */
+/* $OpenBSD: sbdsp.c,v 1.38 2019/12/31 10:05:32 mpi Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -936,7 +936,7 @@ sbdsp_pause(sc)
struct sbdsp_softc *sc;
{
timeout_add_msec(&sc->sc_tmo, 125); /* 8x per second */
- (void)tsleep(sbdsp_to, PWAIT, "sbpause", 0);
+ tsleep_nsec(sbdsp_to, PWAIT, "sbpause", INFSLP);
}
/*
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index b0dfc258f41..5ea1f5e7899 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wds.c,v 1.43 2017/09/08 05:36:52 deraadt Exp $ */
+/* $OpenBSD: wds.c,v 1.44 2019/12/31 10:05:32 mpi Exp $ */
/* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */
#undef WDSDIAG
@@ -503,7 +503,7 @@ wds_get_buf(struct wds_softc *sc, int flags)
}
if ((flags & SCSI_NOSLEEP) != 0)
goto out;
- tsleep(&wds_free_buffer, PRIBIO, "wdsbuf", 0);
+ tsleep_nsec(&wds_free_buffer, PRIBIO, "wdsbuf", INFSLP);
}
buf->busy = 1;