diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-03-02 16:54:40 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2003-03-02 16:54:40 +0000 |
| commit | 521f364b804158f257fdd8ad7cbf368a0efe5a44 (patch) | |
| tree | 351747321ab136aa733f670c4c2c235b3639bc1e /sys/dev/ppbus | |
| parent | 715b1e0ab00116f80903f29c1c794097b1dd7374 (diff) | |
| download | src-521f364b804158f257fdd8ad7cbf368a0efe5a44.tar.gz src-521f364b804158f257fdd8ad7cbf368a0efe5a44.zip | |
More low-hanging fruit: kill caddr_t in calls to wakeup(9) / [mt]sleep(9).
Notes
Notes:
svn path=/head/; revision=111748
Diffstat (limited to 'sys/dev/ppbus')
| -rw-r--r-- | sys/dev/ppbus/lpt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c index 9364c5033659..43fda7eac0b7 100644 --- a/sys/dev/ppbus/lpt.c +++ b/sys/dev/ppbus/lpt.c @@ -444,7 +444,7 @@ lptout(void *arg) lptintr(dev); } else { sc->sc_state &= ~OBUSY; - wakeup((caddr_t)dev); + wakeup(dev); } } @@ -523,7 +523,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)lptdev, LPPRI|PCATCH, "lptinit", hz/4) != + if (tsleep(lptdev, LPPRI|PCATCH, "lptinit", hz/4) != EWOULDBLOCK) { sc->sc_state = 0; splx(s); @@ -597,7 +597,7 @@ lptclose(dev_t dev, int flags, int fmt, struct thread *td) (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)lptdev, LPPRI|PCATCH, + if (tsleep(lptdev, LPPRI|PCATCH, "lpclose", hz) != EWOULDBLOCK) break; @@ -661,7 +661,7 @@ lpt_pushbytes(device_t dev) */ if (tic > MAX_SLEEP) tic = MAX_SLEEP; - err = tsleep((caddr_t)dev, LPPRI, + err = tsleep(dev, LPPRI, LPT_NAME "poll", tic); if (err != EWOULDBLOCK) { return (err); @@ -796,7 +796,7 @@ lptwrite(dev_t dev, struct uio *uio, int ioflag) } lprintf(("W ")); if (sc->sc_state & OBUSY) - if ((err = tsleep((caddr_t)lptdev, + if ((err = tsleep(lptdev, LPPRI|PCATCH, LPT_NAME "write", 0))) { sc->sc_state |= INTERRUPTED; return(err); @@ -872,7 +872,7 @@ lpt_intr(void *arg) sc->sc_state &= ~OBUSY; if(!(sc->sc_state & INTERRUPTED)) - wakeup((caddr_t)lptdev); + wakeup(lptdev); lprintf(("w ")); return; } else { /* check for error */ |