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/i4b/driver/i4b_rbch.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/i4b/driver/i4b_rbch.c')
| -rw-r--r-- | sys/i4b/driver/i4b_rbch.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c index 10b9add..63b941d 100644 --- a/sys/i4b/driver/i4b_rbch.c +++ b/sys/i4b/driver/i4b_rbch.c @@ -260,7 +260,7 @@ i4brbchread(dev_t dev, struct uio *uio, int ioflag) { NDBGL4(L4_RBCHDBG, "unit %d, wait read init", unit); - if((error = tsleep((caddr_t) &rbch_softc[unit], + if((error = tsleep( &rbch_softc[unit], TTIPRI | PCATCH, "rrrbch", 0 )) != 0) { @@ -281,7 +281,7 @@ i4brbchread(dev_t dev, struct uio *uio, int ioflag) NDBGL4(L4_RBCHDBG, "unit %d, wait read data", unit); - if((error = tsleep((caddr_t) &isdn_linktab[unit]->rx_queue, + if((error = tsleep( &isdn_linktab[unit]->rx_queue, TTIPRI | PCATCH, "rrbch", 0 )) != 0) { @@ -355,7 +355,7 @@ i4brbchwrite(dev_t dev, struct uio * uio, int ioflag) { NDBGL4(L4_RBCHDBG, "unit %d, write wait init", unit); - error = tsleep((caddr_t) &rbch_softc[unit], + error = tsleep( &rbch_softc[unit], TTIPRI | PCATCH, "wrrbch", 0 ); if(error == ERESTART) { @@ -374,7 +374,7 @@ i4brbchwrite(dev_t dev, struct uio * uio, int ioflag) NDBGL4(L4_RBCHDBG, "unit %d, error %d tsleep init", unit, error); return(error); } - tsleep((caddr_t) &rbch_softc[unit], TTIPRI | PCATCH, "xrbch", (hz*1)); + tsleep( &rbch_softc[unit], TTIPRI | PCATCH, "xrbch", (hz*1)); } while(_IF_QFULL(isdn_linktab[unit]->tx_queue) && (sc->sc_devstate & ST_ISOPEN)) @@ -383,7 +383,7 @@ i4brbchwrite(dev_t dev, struct uio * uio, int ioflag) NDBGL4(L4_RBCHDBG, "unit %d, write queue full", unit); - if ((error = tsleep((caddr_t) &isdn_linktab[unit]->tx_queue, + if ((error = tsleep( &isdn_linktab[unit]->tx_queue, TTIPRI | PCATCH, "wrbch", 0)) != 0) { sc->sc_devstate &= ~ST_WRWAITEMPTY; @@ -655,7 +655,7 @@ rbch_connect(int unit, void *cdp) NDBGL4(L4_RBCHDBG, "unit %d, wakeup", unit); sc->sc_devstate |= ST_CONNECTED; sc->sc_cd = cdp; - wakeup((caddr_t)sc); + wakeup(sc); } } @@ -737,7 +737,7 @@ rbch_rx_data_rdy(int unit) { NDBGL4(L4_RBCHDBG, "unit %d, wakeup", unit); rbch_softc[unit].sc_devstate &= ~ST_RDWAITDATA; - wakeup((caddr_t) &isdn_linktab[unit]->rx_queue); + wakeup( &isdn_linktab[unit]->rx_queue); } else { @@ -758,7 +758,7 @@ rbch_tx_queue_empty(int unit) { NDBGL4(L4_RBCHDBG, "unit %d, wakeup", unit); rbch_softc[unit].sc_devstate &= ~ST_WRWAITEMPTY; - wakeup((caddr_t) &isdn_linktab[unit]->tx_queue); + wakeup( &isdn_linktab[unit]->tx_queue); } else { |
