From 980acc7d7bcc48ffb9c4319c815cc73e48ad2fdb Mon Sep 17 00:00:00 2001 From: tsutsui Date: Mon, 5 Mar 2007 12:30:37 +0000 Subject: [PATCH] Remove an unnecessary cast and use (char *) on pointer arith. --- sys/arch/cesfic/cesfic/mem.c | 8 ++++---- sys/arch/mac68k/mac68k/mem.c | 8 ++++---- sys/arch/mvme68k/mvme68k/mem.c | 8 ++++---- sys/arch/next68k/next68k/mem.c | 8 ++++---- sys/arch/x68k/x68k/mem.c | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/arch/cesfic/cesfic/mem.c b/sys/arch/cesfic/cesfic/mem.c index fa3073b05e30..0393fd82a67d 100644 --- a/sys/arch/cesfic/cesfic/mem.c +++ b/sys/arch/cesfic/cesfic/mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.10 2007/03/04 05:59:42 christos Exp $ */ +/* $NetBSD: mem.c,v 1.11 2007/03/05 12:30:37 tsutsui Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.10 2007/03/04 05:59:42 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.11 2007/03/05 12:30:37 tsutsui Exp $"); #include #include @@ -157,7 +157,7 @@ mmrw(dev, uio, flags) trunc_page(v), prot, prot|PMAP_WIRED); o = uio->uio_offset & PGOFSET; c = min(uio->uio_resid, (int)(PAGE_SIZE - o)); - error = uiomove((void *)vmmap + o, c, uio); + error = uiomove(vmmap + o, c, uio); pmap_remove(pmap_kernel(), (vm_offset_t)vmmap, (vm_offset_t)vmmap + PAGE_SIZE); continue; @@ -212,7 +212,7 @@ mmrw(dev, uio, flags) } if (error) break; - iov->iov_base = (void *)iov->iov_base + c; + iov->iov_base = (char *)iov->iov_base + c; iov->iov_len -= c; uio->uio_offset += c; uio->uio_resid -= c; diff --git a/sys/arch/mac68k/mac68k/mem.c b/sys/arch/mac68k/mac68k/mem.c index 3feafadf7a21..89932e3bbc93 100644 --- a/sys/arch/mac68k/mac68k/mem.c +++ b/sys/arch/mac68k/mac68k/mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.38 2007/03/04 06:00:08 christos Exp $ */ +/* $NetBSD: mem.c,v 1.39 2007/03/05 12:30:38 tsutsui Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.38 2007/03/04 06:00:08 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.39 2007/03/05 12:30:38 tsutsui Exp $"); #include #include @@ -154,7 +154,7 @@ mmrw(dev_t dev, struct uio *uio, int flags) pmap_update(pmap_kernel()); o = m68k_page_offset(uio->uio_offset); c = min(uio->uio_resid, (int)(PAGE_SIZE - o)); - error = uiomove((void *)vmmap + o, c, uio); + error = uiomove(vmmap + o, c, uio); pmap_remove(pmap_kernel(), (vaddr_t)vmmap, (vaddr_t)vmmap + PAGE_SIZE); pmap_update(pmap_kernel()); @@ -197,7 +197,7 @@ mmrw(dev_t dev, struct uio *uio, int flags) } if (error) break; - iov->iov_base = (void *)iov->iov_base + c; + iov->iov_base = (char *)iov->iov_base + c; iov->iov_len -= c; uio->uio_offset += c; uio->uio_resid -= c; diff --git a/sys/arch/mvme68k/mvme68k/mem.c b/sys/arch/mvme68k/mvme68k/mem.c index f1b0e988e761..63cc9046f371 100644 --- a/sys/arch/mvme68k/mvme68k/mem.c +++ b/sys/arch/mvme68k/mvme68k/mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.25 2007/03/04 06:00:14 christos Exp $ */ +/* $NetBSD: mem.c,v 1.26 2007/03/05 12:30:38 tsutsui Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.25 2007/03/04 06:00:14 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26 2007/03/05 12:30:38 tsutsui Exp $"); #include #include @@ -155,7 +155,7 @@ mmrw(dev, uio, flags) pmap_update(pmap_kernel()); o = uio->uio_offset & PGOFSET; c = min(uio->uio_resid, (int)(PAGE_SIZE - o)); - error = uiomove((void *)vmmap + o, c, uio); + error = uiomove(vmmap + o, c, uio); pmap_remove(pmap_kernel(), (vaddr_t)vmmap, (vaddr_t)vmmap + PAGE_SIZE); pmap_update(pmap_kernel()); @@ -200,7 +200,7 @@ mmrw(dev, uio, flags) } if (error) break; - iov->iov_base = (void *)iov->iov_base + c; + iov->iov_base = (char *)iov->iov_base + c; iov->iov_len -= c; uio->uio_offset += c; uio->uio_resid -= c; diff --git a/sys/arch/next68k/next68k/mem.c b/sys/arch/next68k/next68k/mem.c index 2f1bbea6a07a..917ac4570aa3 100644 --- a/sys/arch/next68k/next68k/mem.c +++ b/sys/arch/next68k/next68k/mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.24 2007/03/04 06:00:27 christos Exp $ */ +/* $NetBSD: mem.c,v 1.25 2007/03/05 12:30:38 tsutsui Exp $ */ /* * This file was taken from mvme68k/mvme68k/mem.c @@ -84,7 +84,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.24 2007/03/04 06:00:27 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.25 2007/03/05 12:30:38 tsutsui Exp $"); #include #include @@ -158,7 +158,7 @@ mmrw(dev_t dev, struct uio *uio, int flags) pmap_update(pmap_kernel()); o = uio->uio_offset & PGOFSET; c = min(uio->uio_resid, (int)(PAGE_SIZE - o)); - error = uiomove((void *)vmmap + o, c, uio); + error = uiomove(vmmap + o, c, uio); pmap_remove(pmap_kernel(), (vaddr_t)vmmap, (vaddr_t)vmmap + PAGE_SIZE); pmap_update(pmap_kernel()); @@ -203,7 +203,7 @@ mmrw(dev_t dev, struct uio *uio, int flags) } if (error) break; - iov->iov_base = (void *)iov->iov_base + c; + iov->iov_base = (char *)iov->iov_base + c; iov->iov_len -= c; uio->uio_offset += c; uio->uio_resid -= c; diff --git a/sys/arch/x68k/x68k/mem.c b/sys/arch/x68k/x68k/mem.c index c46dda18bb47..82568db79962 100644 --- a/sys/arch/x68k/x68k/mem.c +++ b/sys/arch/x68k/x68k/mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.35 2007/03/04 06:01:08 christos Exp $ */ +/* $NetBSD: mem.c,v 1.36 2007/03/05 12:30:38 tsutsui Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.35 2007/03/04 06:01:08 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.36 2007/03/05 12:30:38 tsutsui Exp $"); #include #include @@ -154,7 +154,7 @@ mmrw(dev_t dev, struct uio *uio, int flags) pmap_update(pmap_kernel()); o = m68k_page_offset(uio->uio_offset); c = min(uio->uio_resid, (int)(PAGE_SIZE - o)); - error = uiomove((void *)vmmap + o, c, uio); + error = uiomove(vmmap + o, c, uio); pmap_remove(pmap_kernel(), (vaddr_t)vmmap, (vaddr_t)vmmap + PAGE_SIZE); pmap_update(pmap_kernel()); @@ -198,7 +198,7 @@ mmrw(dev_t dev, struct uio *uio, int flags) } if (error) break; - iov->iov_base = (void *)iov->iov_base + c; + iov->iov_base = (char *)iov->iov_base + c; iov->iov_len -= c; uio->uio_offset += c; uio->uio_resid -= c;