diff options
| author | des <des@FreeBSD.org> | 2003-03-02 16:54:40 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-03-02 16:54:40 +0000 |
| commit | 2756b6c9641bd9899a346582c191310de25cccc5 (patch) | |
| tree | 351747321ab136aa733f670c4c2c235b3639bc1e /sys/pc98/cbus/olpt.c | |
| parent | 3780674329cabab230b12923047c8aa84e4f05fc (diff) | |
| download | FreeBSD-src-2756b6c9641bd9899a346582c191310de25cccc5.zip FreeBSD-src-2756b6c9641bd9899a346582c191310de25cccc5.tar.gz | |
More low-hanging fruit: kill caddr_t in calls to wakeup(9) / [mt]sleep(9).
Diffstat (limited to 'sys/pc98/cbus/olpt.c')
| -rw-r--r-- | sys/pc98/cbus/olpt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c index 5369e46..6e41a42 100644 --- a/sys/pc98/cbus/olpt.c +++ b/sys/pc98/cbus/olpt.c @@ -535,7 +535,7 @@ lptopen (dev_t dev, int flags, int fmt, struct thread *td) } /* wait 1/4 second, give up if we get a signal */ - if (tsleep ((caddr_t)sc, LPPRI|PCATCH, "lptinit", hz/4) != + if (tsleep (sc, LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) { sc->sc_state = 0; splx(s); @@ -601,7 +601,7 @@ lptout (void *arg) splx(pl); } else { sc->sc_state &= ~OBUSY; - wakeup((caddr_t)sc); + wakeup(sc); } } @@ -634,7 +634,7 @@ lptclose(dev_t dev, int flags, int fmt, struct thread *td) while ((inb(port+lpt_status) & (LPS_SEL|LPS_OUT|LPS_NBSY|LPS_NERR)) != (LPS_SEL|LPS_NBSY|LPS_NERR) || sc->sc_xfercnt) /* wait 1/4 second, give up if we get a signal */ - if (tsleep ((caddr_t)sc, LPPRI|PCATCH, + if (tsleep (sc, LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK) break; @@ -692,7 +692,7 @@ pushbytes(struct lpt_softc * sc) */ if (tic > MAX_SLEEP) tic = MAX_SLEEP; - err = tsleep((caddr_t)sc, LPPRI, + err = tsleep(sc, LPPRI, "lptpoll", tic); if (err != EWOULDBLOCK) { return (err); @@ -754,7 +754,7 @@ lptwrite(dev_t dev, struct uio * uio, int ioflag) } lprintf(("W ")); if (sc->sc_state & OBUSY) - if ((err = tsleep ((caddr_t)sc, + if ((err = tsleep (sc, LPPRI|PCATCH, "lpwrite", 0))) { sc->sc_state |= INTERRUPTED; return(err); |
