More low-hanging fruit: kill caddr_t in calls to wakeup(9) / [mt]sleep(9).

5 files changed, 14 insertions, 14 deletions

diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 152f8f7..2a50da4 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -122,7 +122,7 @@ loop:
 	 */
 	if (fdcache_lock & FDL_LOCKED) {
 		fdcache_lock |= FDL_WANT;
-		(void) tsleep((caddr_t) &fdcache_lock, PINOD, "fdalvp", 0);
+		(void) tsleep( &fdcache_lock, PINOD, "fdalvp", 0);
 		goto loop;
 	}
 	fdcache_lock |= FDL_LOCKED;
@@ -151,7 +151,7 @@ out:
 
 	if (fdcache_lock & FDL_WANT) {
 		fdcache_lock &= ~FDL_WANT;
-		wakeup((caddr_t) &fdcache_lock);
+		wakeup( &fdcache_lock);
 	}
 
 	return (error);
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 64fee38..441e9fd 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -210,7 +210,7 @@ fifo_open(ap)
 		if (fip->fi_readers == 1) {
 			fip->fi_writesock->so_state &= ~SS_CANTSENDMORE;
 			if (fip->fi_writers > 0) {
-				wakeup((caddr_t)&fip->fi_writers);
+				wakeup(&fip->fi_writers);
 				sowwakeup(fip->fi_writesock);
 			}
 		}
@@ -220,7 +220,7 @@ fifo_open(ap)
 		if (fip->fi_writers == 1) {
 			fip->fi_readsock->so_state &= ~SS_CANTRCVMORE;
 			if (fip->fi_readers > 0) {
-				wakeup((caddr_t)&fip->fi_readers);
+				wakeup(&fip->fi_readers);
 				sorwakeup(fip->fi_writesock);
 			}
 		}
@@ -228,7 +228,7 @@ fifo_open(ap)
 	if ((ap->a_mode & FREAD) && (ap->a_mode & O_NONBLOCK) == 0) {
 		while (fip->fi_writers == 0) {
 			VOP_UNLOCK(vp, 0, td);
-			error = tsleep((caddr_t)&fip->fi_readers,
+			error = tsleep(&fip->fi_readers,
 			    PCATCH | PSOCK, "fifoor", 0);
 			vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 			if (error)
@@ -249,7 +249,7 @@ fifo_open(ap)
 				 * by timing out after a sec.  Race seen when
 				 * sendmail hangs here during boot /phk
 				 */
-				error = tsleep((caddr_t)&fip->fi_writers,
+				error = tsleep(&fip->fi_writers,
 				    PCATCH | PSOCK, "fifoow", hz);
 				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 				if (error)
diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c
index c282f58..0d03034 100644
--- a/sys/fs/nwfs/nwfs_io.c
+++ b/sys/fs/nwfs/nwfs_io.c
@@ -617,7 +617,7 @@ nwfs_vinvalbuf(vp, flags, cred, td, intrflg)
 	}
 	while (np->n_flag & NFLUSHINPROG) {
 		np->n_flag |= NFLUSHWANT;
-		error = tsleep((caddr_t)&np->n_flag, PRIBIO + 2, "nwfsvinv", slptimeo);
+		error = tsleep(&np->n_flag, PRIBIO + 2, "nwfsvinv", slptimeo);
 		error = ncp_chkintr(NWFSTOCONN(VTONWFS(vp)), td);
 		if (error == EINTR && intrflg)
 			return EINTR;
@@ -629,7 +629,7 @@ nwfs_vinvalbuf(vp, flags, cred, td, intrflg)
 			np->n_flag &= ~NFLUSHINPROG;
 			if (np->n_flag & NFLUSHWANT) {
 				np->n_flag &= ~NFLUSHWANT;
-				wakeup((caddr_t)&np->n_flag);
+				wakeup(&np->n_flag);
 			}
 			return EINTR;
 		}
@@ -638,7 +638,7 @@ nwfs_vinvalbuf(vp, flags, cred, td, intrflg)
 	np->n_flag &= ~(NMODIFIED | NFLUSHINPROG);
 	if (np->n_flag & NFLUSHWANT) {
 		np->n_flag &= ~NFLUSHWANT;
-		wakeup((caddr_t)&np->n_flag);
+		wakeup(&np->n_flag);
 	}
 	return (error);
 }
diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c
index 6c69090..a35932b 100644
--- a/sys/fs/smbfs/smbfs_io.c
+++ b/sys/fs/smbfs/smbfs_io.c
@@ -687,7 +687,7 @@ smbfs_vinvalbuf(vp, flags, cred, td, intrflg)
 	}
 	while (np->n_flag & NFLUSHINPROG) {
 		np->n_flag |= NFLUSHWANT;
-		error = tsleep((caddr_t)&np->n_flag, PRIBIO + 2, "smfsvinv", slptimeo);
+		error = tsleep(&np->n_flag, PRIBIO + 2, "smfsvinv", slptimeo);
 		error = smb_proc_intr(td->td_proc);
 		if (error == EINTR && intrflg)
 			return EINTR;
@@ -699,7 +699,7 @@ smbfs_vinvalbuf(vp, flags, cred, td, intrflg)
 			np->n_flag &= ~NFLUSHINPROG;
 			if (np->n_flag & NFLUSHWANT) {
 				np->n_flag &= ~NFLUSHWANT;
-				wakeup((caddr_t)&np->n_flag);
+				wakeup(&np->n_flag);
 			}
 			return EINTR;
 		}
@@ -708,7 +708,7 @@ smbfs_vinvalbuf(vp, flags, cred, td, intrflg)
 	np->n_flag &= ~(NMODIFIED | NFLUSHINPROG);
 	if (np->n_flag & NFLUSHWANT) {
 		np->n_flag &= ~NFLUSHWANT;
-		wakeup((caddr_t)&np->n_flag);
+		wakeup(&np->n_flag);
 	}
 	return (error);
 }
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index e08b70a..643e150 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -112,7 +112,7 @@ union_list_lock(ix)
 {
 	if (unvplock[ix] & UNVP_LOCKED) {
 		unvplock[ix] |= UNVP_WANT;
-		(void) tsleep((caddr_t) &unvplock[ix], PINOD, "unllck", 0);
+		(void) tsleep( &unvplock[ix], PINOD, "unllck", 0);
 		return (1);
 	}
 	unvplock[ix] |= UNVP_LOCKED;
@@ -127,7 +127,7 @@ union_list_unlock(ix)
 
 	if (unvplock[ix] & UNVP_WANT) {
 		unvplock[ix] &= ~UNVP_WANT;
-		wakeup((caddr_t) &unvplock[ix]);
+		wakeup( &unvplock[ix]);
 	}
 }