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/isa | |
| 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/isa')
| -rw-r--r-- | sys/isa/ppc.c | 6 | ||||
| -rw-r--r-- | sys/isa/psm.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/isa/ppc.c b/sys/isa/ppc.c index 52c2f6a..690d0cc 100644 --- a/sys/isa/ppc.c +++ b/sys/isa/ppc.c @@ -1614,7 +1614,7 @@ ppcintr(void *arg) ppc->ppc_dmastat = PPC_DMA_COMPLETE; /* wakeup the waiting process */ - wakeup((caddr_t)ppc); + wakeup(ppc); } } } else if (ppc->ppc_irqstat & PPC_IRQ_FIFO) { @@ -1720,7 +1720,7 @@ ppc_write(device_t dev, char *buf, int len, int how) */ do { /* release CPU */ - error = tsleep((caddr_t)ppc, + error = tsleep(ppc, PPBPRI | PCATCH, "ppcdma", 0); } while (error == EWOULDBLOCK); @@ -1752,7 +1752,7 @@ ppc_write(device_t dev, char *buf, int len, int how) #ifdef PPC_DEBUG printf("Z"); #endif - error = tsleep((caddr_t)ppc, PPBPRI | PCATCH, "ppcfifo", hz/100); + error = tsleep(ppc, PPBPRI | PCATCH, "ppcfifo", hz/100); if (error != EWOULDBLOCK) { #ifdef PPC_DEBUG printf("I"); diff --git a/sys/isa/psm.c b/sys/isa/psm.c index bec4448..5b4cc20 100644 --- a/sys/isa/psm.c +++ b/sys/isa/psm.c @@ -1528,7 +1528,7 @@ psmread(dev_t dev, struct uio *uio, int flag) return EWOULDBLOCK; } sc->state |= PSM_ASLP; - error = tsleep((caddr_t) sc, PZERO | PCATCH, "psmrea", 0); + error = tsleep( sc, PZERO | PCATCH, "psmrea", 0); sc->state &= ~PSM_ASLP; if (error) { splx(s); @@ -2366,7 +2366,7 @@ psmintr(void *arg) if (sc->state & PSM_ASLP) { sc->state &= ~PSM_ASLP; - wakeup((caddr_t) sc); + wakeup( sc); } selwakeup(&sc->rsel); } @@ -2821,7 +2821,7 @@ psmresume(device_t dev) * cannot be accessed anymore. */ sc->state &= ~PSM_ASLP; - wakeup((caddr_t)sc); + wakeup(sc); } if (verbose >= 2) |
