remove more caddr_t

3 files changed, 11 insertions, 13 deletions

diff --git a/sys/miscfs/procfs/procfs_ctl.c b/sys/miscfs/procfs/procfs_ctl.c
index 53cec8ee556..c38270f3c33 100644
--- a/sys/miscfs/procfs/procfs_ctl.c
+++ b/sys/miscfs/procfs/procfs_ctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procfs_ctl.c,v 1.12 2003/08/11 10:08:04 mickey Exp $	*/
+/*	$OpenBSD: procfs_ctl.c,v 1.13 2004/05/20 18:32:38 tedu Exp $	*/
 /*	$NetBSD: procfs_ctl.c,v 1.14 1996/02/09 22:40:48 christos Exp $	*/
 
 /*
@@ -197,7 +197,7 @@ procfs_control(curp, p, op)
 
 		p->p_oppid = 0;
 		CLR(p->p_flag, P_WAITED); /* XXX ? */
-		wakeup((caddr_t) curp);	/* XXX for CTL_WAIT below ? */
+		wakeup(curp);	/* XXX for CTL_WAIT below ? */
 
 		break;
 
@@ -231,15 +231,13 @@ procfs_control(curp, p, op)
 					(p->p_stat != SSTOP) &&
 					ISSET(p->p_flag, P_TRACED) &&
 					(p->p_pptr == curp)) {
-				error = tsleep((caddr_t) p,
-						PWAIT|PCATCH, "procfsx", 0);
+				error = tsleep(p, PWAIT|PCATCH, "procfsx", 0);
 			}
 			if (error == 0 && !TRACE_WAIT_P(curp, p))
 				error = EBUSY;
 		} else {
 			while (error == 0 && p->p_stat != SSTOP) {
-				error = tsleep((caddr_t) p,
-						PWAIT|PCATCH, "procfs", 0);
+				error = tsleep(p, PWAIT|PCATCH, "procfs", 0);
 			}
 		}
 		return (error);
diff --git a/sys/miscfs/procfs/procfs_vfsops.c b/sys/miscfs/procfs/procfs_vfsops.c
index 3b0b8db5262..632d9c7867b 100644
--- a/sys/miscfs/procfs/procfs_vfsops.c
+++ b/sys/miscfs/procfs/procfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procfs_vfsops.c,v 1.23 2004/03/03 05:41:37 tedu Exp $	*/
+/*	$OpenBSD: procfs_vfsops.c,v 1.24 2004/05/20 18:32:38 tedu Exp $	*/
 /*	$NetBSD: procfs_vfsops.c,v 1.25 1996/02/09 22:40:53 christos Exp $	*/
 
 /*
@@ -102,7 +102,7 @@ procfs_mount(mp, path, data, ndp, p)
 	pmnt = (struct procfsmount *) malloc(sizeof(struct procfsmount),
 	    M_MISCFSMNT, M_WAITOK);
 
-	mp->mnt_data = (qaddr_t)pmnt;
+	mp->mnt_data = pmnt;
 	vfs_getnewfsid(mp);
 
 	(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 40da1bc0c2f..5cc206c1444 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procfs_vnops.c,v 1.30 2003/09/23 16:51:13 millert Exp $	*/
+/*	$OpenBSD: procfs_vnops.c,v 1.31 2004/05/20 18:32:38 tedu Exp $	*/
 /*	$NetBSD: procfs_vnops.c,v 1.40 1996/03/16 23:52:55 christos Exp $	*/
 
 /*
@@ -936,7 +936,7 @@ procfs_readdir(v)
 	i = uio->uio_offset;
 	if (i < 0)
 		return (EINVAL);
-	bzero((caddr_t)&d, UIO_MX);
+	bzero(&d, UIO_MX);
 	d.d_reclen = UIO_MX;
 
 	switch (pfs->pfs_type) {
@@ -964,7 +964,7 @@ procfs_readdir(v)
 			bcopy(pt->pt_name, d.d_name, pt->pt_namlen + 1);
 			d.d_type = pt->pt_type;
 
-			if ((error = uiomove((caddr_t)&d, UIO_MX, uio)) != 0)
+			if ((error = uiomove(&d, UIO_MX, uio)) != 0)
 				break;
 		}
 
@@ -1054,7 +1054,7 @@ procfs_readdir(v)
 				break;
 			}
 
-			if ((error = uiomove((caddr_t)&d, UIO_MX, uio)) != 0)
+			if ((error = uiomove(&d, UIO_MX, uio)) != 0)
 				break;
 		}
 	done:
@@ -1098,7 +1098,7 @@ procfs_readlink(v)
 	else
 		return (EINVAL);
 
-	return (uiomove((caddr_t)buf, len, ap->a_uio));
+	return (uiomove(buf, len, ap->a_uio));
 }
 
 /*