summaryrefslogtreecommitdiffstats
path: root/sys/dev/speaker
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2003-03-02 16:54:40 +0000
committerdes <des@FreeBSD.org>2003-03-02 16:54:40 +0000
commit2756b6c9641bd9899a346582c191310de25cccc5 (patch)
tree351747321ab136aa733f670c4c2c235b3639bc1e /sys/dev/speaker
parent3780674329cabab230b12923047c8aa84e4f05fc (diff)
downloadFreeBSD-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/dev/speaker')
-rw-r--r--sys/dev/speaker/spkr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c
index de4c5ca..22b6bf3 100644
--- a/sys/dev/speaker/spkr.c
+++ b/sys/dev/speaker/spkr.c
@@ -140,7 +140,7 @@ tone(thz, ticks)
* emitted.
*/
if (ticks > 0)
- tsleep((caddr_t)&endtone, SPKRPRI | PCATCH, "spkrtn", ticks);
+ tsleep(&endtone, SPKRPRI | PCATCH, "spkrtn", ticks);
SPEAKER_OFF;
sps = splclock();
TIMER_RELEASE;
@@ -161,7 +161,7 @@ rest(ticks)
(void) printf("rest: %d\n", ticks);
#endif /* DEBUG */
if (ticks > 0)
- tsleep((caddr_t)&endrest, SPKRPRI | PCATCH, "spkrrs", ticks);
+ tsleep(&endrest, SPKRPRI | PCATCH, "spkrrs", ticks);
}
/**************** PLAY STRING INTERPRETER BEGINS HERE **********************
@@ -548,8 +548,8 @@ spkrclose(dev, flags, fmt, td)
return(ENXIO);
else
{
- wakeup((caddr_t)&endtone);
- wakeup((caddr_t)&endrest);
+ wakeup(&endtone);
+ wakeup(&endrest);
free(spkr_inbuf, M_SPKR);
spkr_active = FALSE;
return(0);
OpenPOWER on IntegriCloud