remove stupid casts, ok deraadt

15 files changed, 50 insertions, 50 deletions

diff --git a/sys/dev/raidframe/rf_alloclist.c b/sys/dev/raidframe/rf_alloclist.c
index 9da2da7feaa..ea433c36a2b 100644
--- a/sys/dev/raidframe/rf_alloclist.c
+++ b/sys/dev/raidframe/rf_alloclist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_alloclist.c,v 1.4 2002/12/16 07:01:03 tdeval Exp $	*/
+/*	$OpenBSD: rf_alloclist.c,v 1.5 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_alloclist.c,v 1.4 1999/08/13 03:41:53 oster Exp $	*/
 
 /*
@@ -185,6 +185,6 @@ rf_real_MakeAllocList(int lockflag)
 	if (p == NULL) {
 		return (NULL);
 	}
-	bzero((char *) p, sizeof(RF_AllocListElem_t));
+	bzero(p, sizeof(RF_AllocListElem_t));
 	return (p);
 }
diff --git a/sys/dev/raidframe/rf_cvscan.c b/sys/dev/raidframe/rf_cvscan.c
index cf55ef631c9..68df97946c8 100644
--- a/sys/dev/raidframe/rf_cvscan.c
+++ b/sys/dev/raidframe/rf_cvscan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_cvscan.c,v 1.5 2002/12/16 07:01:03 tdeval Exp $	*/
+/*	$OpenBSD: rf_cvscan.c,v 1.6 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_cvscan.c,v 1.5 1999/08/13 03:41:53 oster Exp $	*/
 
 /*
@@ -352,7 +352,7 @@ rf_CvscanCreate(RF_SectorCount_t sectPerDisk, RF_AllocListElem_t *clList,
 
 	RF_MallocAndAdd(hdr, sizeof(RF_CvscanHeader_t), (RF_CvscanHeader_t *),
 	    clList);
-	bzero((char *) hdr, sizeof(RF_CvscanHeader_t));
+	bzero(hdr, sizeof(RF_CvscanHeader_t));
 	hdr->range_for_avg = RF_MAX(range, 1);
 	hdr->change_penalty = RF_MAX(penalty, 0);
 	hdr->direction = rf_cvscan_RIGHT;
diff --git a/sys/dev/raidframe/rf_dagutils.c b/sys/dev/raidframe/rf_dagutils.c
index 78f04e8e1f0..b0fd6bdcec6 100644
--- a/sys/dev/raidframe/rf_dagutils.c
+++ b/sys/dev/raidframe/rf_dagutils.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_dagutils.c,v 1.4 2002/12/16 07:01:03 tdeval Exp $	*/
+/*	$OpenBSD: rf_dagutils.c,v 1.5 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_dagutils.c,v 1.6 1999/12/09 02:26:09 oster Exp $	*/
 
 /*
@@ -246,7 +246,7 @@ rf_AllocDAGHeader(void)
 
 	RF_FREELIST_GET(rf_dagh_freelist, dh, next, (RF_DagHeader_t *));
 	if (dh) {
-		bzero((char *) dh, sizeof(RF_DagHeader_t));
+		bzero(dh, sizeof(RF_DagHeader_t));
 	}
 	return (dh);
 }
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c
index 4c67be9393c..09402bfbb61 100644
--- a/sys/dev/raidframe/rf_driver.c
+++ b/sys/dev/raidframe/rf_driver.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_driver.c,v 1.12 2008/06/26 05:42:17 ray Exp $	*/
+/*	$OpenBSD: rf_driver.c,v 1.13 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_driver.c,v 1.37 2000/06/04 02:05:13 oster Exp $	*/
 
 /*
@@ -636,7 +636,7 @@ rf_AllocRaidAccDesc(
 	desc->state = 0;
 
 	desc->status = 0;
-	bzero((char *) &desc->tracerec, sizeof(RF_AccTraceEntry_t));
+	bzero(&desc->tracerec, sizeof(RF_AccTraceEntry_t));
 	desc->callbackFunc = (void (*) (RF_CBParam_t)) cbF;	/* XXX */
 	desc->callbackArg = cbA;
 	desc->next = NULL;
diff --git a/sys/dev/raidframe/rf_evenodd.c b/sys/dev/raidframe/rf_evenodd.c
index da372aca9ed..f613016d7ae 100644
--- a/sys/dev/raidframe/rf_evenodd.c
+++ b/sys/dev/raidframe/rf_evenodd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_evenodd.c,v 1.5 2002/12/16 07:01:03 tdeval Exp $	*/
+/*	$OpenBSD: rf_evenodd.c,v 1.6 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_evenodd.c,v 1.4 2000/01/07 03:40:59 oster Exp $	*/
 
 /*
@@ -529,7 +529,7 @@ rf_VerifyParityEvenOdd(
 	    asmap->qInfo;
 
 	/* Fire off the DAG. */
-	bzero((char *) &tracerec, sizeof(tracerec));
+	bzero(&tracerec, sizeof(tracerec));
 	rd_dag_h->tracerec = &tracerec;
 
 	if (rf_verifyParityDebug) {
@@ -601,7 +601,7 @@ rf_VerifyParityEvenOdd(
 		wrBlock->succedents[0]->params[2].v = psID;
 		wrBlock->succedents[0]->params[3].v =
 		    RF_CREATE_PARAM3(RF_IO_NORMAL_PRIORITY, 0, 0, which_ru);
-		bzero((char *) &tracerec, sizeof(tracerec));
+		bzero(&tracerec, sizeof(tracerec));
 		wr_dag_h->tracerec = &tracerec;
 		if (rf_verifyParityDebug) {
 			printf("Parity verify write dag:\n");
@@ -633,7 +633,7 @@ rf_VerifyParityEvenOdd(
 		wrBlock->succedents[0]->params[2].v = psID;
 		wrBlock->succedents[0]->params[3].v =
 		    RF_CREATE_PARAM3(RF_IO_NORMAL_PRIORITY, 0, 0, which_ru);
-		bzero((char *) &tracerec, sizeof(tracerec));
+		bzero(&tracerec, sizeof(tracerec));
 		wr_dag_h->tracerec = &tracerec;
 		if (rf_verifyParityDebug) {
 			printf("Dag of write new second redundant information"
diff --git a/sys/dev/raidframe/rf_evenodd_dagfuncs.c b/sys/dev/raidframe/rf_evenodd_dagfuncs.c
index d619b1ca50e..7763976f098 100644
--- a/sys/dev/raidframe/rf_evenodd_dagfuncs.c
+++ b/sys/dev/raidframe/rf_evenodd_dagfuncs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_evenodd_dagfuncs.c,v 1.7 2002/12/16 07:01:04 tdeval Exp $	*/
+/*	$OpenBSD: rf_evenodd_dagfuncs.c,v 1.8 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_evenodd_dagfuncs.c,v 1.6 2000/03/30 12:45:40 augustss Exp $	*/
 
 /*
@@ -454,7 +454,7 @@ rf_RecoveryEFunc(RF_DagNode_t *node)
 	RF_AccTraceEntry_t *tracerec = node->dagHdr->tracerec;
 	RF_Etimer_t timer;
 
-	bzero((char *) node->results[0], rf_RaidAddressToByte(raidPtr, failedPDA->numSector));
+	bzero(node->results[0], rf_RaidAddressToByte(raidPtr, failedPDA->numSector));
 	if (node->dagHdr->status == rf_enable) {
 		RF_ETIMER_START(timer);
 		for (i = 0; i < node->numParams - 2; i += 2)
@@ -538,8 +538,8 @@ rf_doubleEOdecode(RF_Raid_t *raidPtr, char **rrdbuf, char **dest,
 #endif
 	RF_ASSERT(*((long *) dest[0]) == 0);
 	RF_ASSERT(*((long *) dest[1]) == 0);
-	bzero((char *) P, bytesPerEU);
-	bzero((char *) temp, bytesPerEU);
+	bzero(P, bytesPerEU);
+	bzero(temp, bytesPerEU);
 	RF_ASSERT(*P == 0);
 	/*
 	 * Calculate the 'P' parameter, which, not parity, is the Xor of all
diff --git a/sys/dev/raidframe/rf_map.c b/sys/dev/raidframe/rf_map.c
index bc36e17aaa8..4efc01c8740 100644
--- a/sys/dev/raidframe/rf_map.c
+++ b/sys/dev/raidframe/rf_map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_map.c,v 1.5 2002/12/16 07:01:04 tdeval Exp $	*/
+/*	$OpenBSD: rf_map.c,v 1.6 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_map.c,v 1.5 2000/06/29 00:22:27 oster Exp $	*/
 
 /*
@@ -136,7 +136,7 @@ rf_MapAccess(
 		RF_ASSERT(asmList);
 		t_asm = asmList;
 		asmList = asmList->next;
-		bzero((char *) t_asm, sizeof(RF_AccessStripeMap_t));
+		bzero(t_asm, sizeof(RF_AccessStripeMap_t));
 		if (!asm_p)
 			asm_list = asm_p = t_asm;
 		else {
@@ -167,7 +167,7 @@ rf_MapAccess(
 			RF_ASSERT(pdaList);
 			t_pda = pdaList;
 			pdaList = pdaList->next;
-			bzero((char *) t_pda, sizeof(RF_PhysDiskAddr_t));
+			bzero(t_pda, sizeof(RF_PhysDiskAddr_t));
 			if (!pda_p)
 				asm_p->physInfo = pda_p = t_pda;
 			else {
@@ -224,7 +224,7 @@ rf_MapAccess(
 			RF_ASSERT(pdaList);
 			t_pda = pdaList;
 			pdaList = pdaList->next;
-			bzero((char *) t_pda, sizeof(RF_PhysDiskAddr_t));
+			bzero(t_pda, sizeof(RF_PhysDiskAddr_t));
 			pda_p = asm_p->parityInfo = t_pda;
 			pda_p->type = RF_PDA_TYPE_PARITY;
 			(layoutPtr->map->MapParity) (raidPtr,
@@ -248,12 +248,12 @@ rf_MapAccess(
 			RF_ASSERT(pdaList && pdaList->next);
 			t_pda = pdaList;
 			pdaList = pdaList->next;
-			bzero((char *) t_pda, sizeof(RF_PhysDiskAddr_t));
+			bzero(t_pda, sizeof(RF_PhysDiskAddr_t));
 			pda_p = asm_p->parityInfo = t_pda;
 			pda_p->type = RF_PDA_TYPE_PARITY;
 			t_pda = pdaList;
 			pdaList = pdaList->next;
-			bzero((char *) t_pda, sizeof(RF_PhysDiskAddr_t));
+			bzero(t_pda, sizeof(RF_PhysDiskAddr_t));
 			pda_q = asm_p->qInfo = t_pda;
 			pda_q->type = RF_PDA_TYPE_Q;
 			(layoutPtr->map->MapParity) (raidPtr,
@@ -316,7 +316,7 @@ rf_MarkFailuresInASMList(RF_Raid_t *raidPtr, RF_AccessStripeMapHeader_t *asm_h)
 		asmap->numDataFailed = asmap->numParityFailed =
 		    asmap->numQFailed = 0;
 		asmap->numFailedPDAs = 0;
-		bzero((char *) asmap->failedPDAs,
+		bzero(asmap->failedPDAs,
 		    RF_MAX_FAILED_PDA * sizeof(RF_PhysDiskAddr_t *));
 		for (pda = asmap->physInfo; pda; pda = pda->next) {
 			if (RF_DEAD_DISK(disks[pda->row][pda->col].status)) {
@@ -497,7 +497,7 @@ rf_AllocAccessStripeMapHeader(void)
 
 	RF_FREELIST_GET(rf_asmhdr_freelist, p, next,
 	    (RF_AccessStripeMapHeader_t *));
-	bzero((char *) p, sizeof(RF_AccessStripeMapHeader_t));
+	bzero(p, sizeof(RF_AccessStripeMapHeader_t));
 
 	return (p);
 }
@@ -514,7 +514,7 @@ rf_AllocPhysDiskAddr(void)
 	RF_PhysDiskAddr_t *p;
 
 	RF_FREELIST_GET(rf_pda_freelist, p, next, (RF_PhysDiskAddr_t *));
-	bzero((char *) p, sizeof(RF_PhysDiskAddr_t));
+	bzero(p, sizeof(RF_PhysDiskAddr_t));
 
 	return (p);
 }
@@ -559,7 +559,7 @@ rf_AllocAccessStripeMapComponent(void)
 	RF_AccessStripeMap_t *p;
 
 	RF_FREELIST_GET(rf_asm_freelist, p, next, (RF_AccessStripeMap_t *));
-	bzero((char *) p, sizeof(RF_AccessStripeMap_t));
+	bzero(p, sizeof(RF_AccessStripeMap_t));
 
 	return (p);
 }
diff --git a/sys/dev/raidframe/rf_memchunk.c b/sys/dev/raidframe/rf_memchunk.c
index 2febacde6d2..56ff6882f1a 100644
--- a/sys/dev/raidframe/rf_memchunk.c
+++ b/sys/dev/raidframe/rf_memchunk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_memchunk.c,v 1.4 2002/12/16 07:01:04 tdeval Exp $	*/
+/*	$OpenBSD: rf_memchunk.c,v 1.5 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_memchunk.c,v 1.4 1999/08/13 03:41:56 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
@@ -179,7 +179,7 @@ rf_GetMemChunk(size)
 		p = rf_NewMemChunk(size, buf);
 	}
 	RF_UNLOCK_MUTEX(chunkmutex);
-	(void) bzero(p->buf, size);
+	bzero(p->buf, size);
 	return (p);
 }
 
diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c
index 70b640f1aa1..c1bd25b2318 100644
--- a/sys/dev/raidframe/rf_openbsdkintf.c
+++ b/sys/dev/raidframe/rf_openbsdkintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rf_openbsdkintf.c,v 1.63 2011/06/05 18:40:33 matthew Exp $	*/
+/* $OpenBSD: rf_openbsdkintf.c,v 1.64 2011/06/21 16:46:00 tedu Exp $	*/
 /* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $	*/
 
 /*-
@@ -961,7 +961,7 @@ raidioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		 *  there is no stale data left in the case of a
 		 *  reconfiguration.
 		 */
-		bzero((char *) raidPtr, sizeof(RF_Raid_t));
+		bzero(raidPtr, sizeof(RF_Raid_t));
 
 		/* Configure the system. */
 		raidPtr->raidid = unit;
@@ -1042,7 +1042,7 @@ raidioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 		if (clabel == NULL)
 			return (ENOMEM);
 
-		bzero((char *) clabel, sizeof(RF_ComponentLabel_t));
+		bzero(clabel, sizeof(RF_ComponentLabel_t));
 
 		retcode = copyin( *clabel_ptr, clabel,
 				  sizeof(RF_ComponentLabel_t));
@@ -1241,7 +1241,7 @@ raidioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 			  (RF_DeviceConfig_t *));
 		if (d_cfg == NULL)
 			return (ENOMEM);
-		bzero((char *) d_cfg, sizeof(RF_DeviceConfig_t));
+		bzero(d_cfg, sizeof(RF_DeviceConfig_t));
 		d_cfg->rows = raidPtr->numRow;
 		d_cfg->cols = raidPtr->numCol;
 		d_cfg->ndevs = raidPtr->numRow * raidPtr->numCol;
diff --git a/sys/dev/raidframe/rf_paritylogDiskMgr.c b/sys/dev/raidframe/rf_paritylogDiskMgr.c
index 65f699d4f5f..6014eaeb0b9 100644
--- a/sys/dev/raidframe/rf_paritylogDiskMgr.c
+++ b/sys/dev/raidframe/rf_paritylogDiskMgr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_paritylogDiskMgr.c,v 1.6 2002/12/16 07:01:04 tdeval Exp $	*/
+/*	$OpenBSD: rf_paritylogDiskMgr.c,v 1.7 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_paritylogDiskMgr.c,v 1.10 2000/01/15 01:57:57 oster Exp $	*/
 
 /*
@@ -154,7 +154,7 @@ rf_ReadRegionLog(RF_RegionId_t regionID, RF_MCPair_t *rrd_mcpair,
 	}
 	/* Initialize DAG parameters. */
 	RF_Malloc(tracerec, sizeof(RF_AccTraceEntry_t), (RF_AccTraceEntry_t *));
-	bzero((char *) tracerec, sizeof(RF_AccTraceEntry_t));
+	bzero(tracerec, sizeof(RF_AccTraceEntry_t));
 	(*rrd_dag_h)->tracerec = tracerec;
 	rrd_rdNode = (*rrd_dag_h)->succedents[0]->succedents[0];
 	rrd_rdNode->params[0].p = *rrd_pda;
@@ -203,7 +203,7 @@ rf_WriteCoreLog(RF_ParityLog_t *log, RF_MCPair_t *fwr_mcpair,
 
 	/* Initialize DAG parameters. */
 	RF_Malloc(tracerec, sizeof(RF_AccTraceEntry_t), (RF_AccTraceEntry_t *));
-	bzero((char *) tracerec, sizeof(RF_AccTraceEntry_t));
+	bzero(tracerec, sizeof(RF_AccTraceEntry_t));
 	(*fwr_dag_h)->tracerec = tracerec;
 	fwr_wrNode = (*fwr_dag_h)->succedents[0]->succedents[0];
 	fwr_wrNode->params[0].p = *fwr_pda;
@@ -255,7 +255,7 @@ rf_ReadRegionParity(RF_RegionId_t regionID, RF_MCPair_t *prd_mcpair,
 	}
 	/* Initialize DAG parameters. */
 	RF_Malloc(tracerec, sizeof(RF_AccTraceEntry_t), (RF_AccTraceEntry_t *));
-	bzero((char *) tracerec, sizeof(RF_AccTraceEntry_t));
+	bzero(tracerec, sizeof(RF_AccTraceEntry_t));
 	(*prd_dag_h)->tracerec = tracerec;
 	prd_rdNode = (*prd_dag_h)->succedents[0]->succedents[0];
 	prd_rdNode->params[0].p = *prd_pda;
@@ -301,7 +301,7 @@ rf_WriteRegionParity(RF_RegionId_t regionID, RF_MCPair_t *pwr_mcpair,
 
 	/* Initialize DAG parameters. */
 	RF_Malloc(tracerec, sizeof(RF_AccTraceEntry_t), (RF_AccTraceEntry_t *));
-	bzero((char *) tracerec, sizeof(RF_AccTraceEntry_t));
+	bzero(tracerec, sizeof(RF_AccTraceEntry_t));
 	(*pwr_dag_h)->tracerec = tracerec;
 	pwr_wrNode = (*pwr_dag_h)->succedents[0]->succedents[0];
 	pwr_wrNode->params[0].p = *pwr_pda;
diff --git a/sys/dev/raidframe/rf_parityscan.c b/sys/dev/raidframe/rf_parityscan.c
index 860388c33d8..b6946c96212 100644
--- a/sys/dev/raidframe/rf_parityscan.c
+++ b/sys/dev/raidframe/rf_parityscan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_parityscan.c,v 1.7 2002/12/16 07:01:04 tdeval Exp $	*/
+/*	$OpenBSD: rf_parityscan.c,v 1.8 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_parityscan.c,v 1.9 2000/05/28 03:00:31 oster Exp $	*/
 
 /*
@@ -247,7 +247,7 @@ rf_VerifyParityBasic(RF_Raid_t *raidPtr, RF_RaidAddr_t raidAddr,
 	    asmap->parityInfo;
 
 	/* Fire off the DAG. */
-	bzero((char *) &tracerec, sizeof(tracerec));
+	bzero(&tracerec, sizeof(tracerec));
 	rd_dag_h->tracerec = &tracerec;
 
 	if (rf_verifyParityDebug) {
@@ -298,7 +298,7 @@ rf_VerifyParityBasic(RF_Raid_t *raidPtr, RF_RaidAddr_t raidAddr,
 		wrBlock->succedents[0]->params[2].v = psID;
 		wrBlock->succedents[0]->params[3].v =
 		    RF_CREATE_PARAM3(RF_IO_NORMAL_PRIORITY, 0, 0, which_ru);
-		bzero((char *) &tracerec, sizeof(tracerec));
+		bzero(&tracerec, sizeof(tracerec));
 		wr_dag_h->tracerec = &tracerec;
 		if (rf_verifyParityDebug) {
 			printf("Parity verify write dag:\n");
diff --git a/sys/dev/raidframe/rf_raid1.c b/sys/dev/raidframe/rf_raid1.c
index e9a3dd31fe1..bbac2dc996d 100644
--- a/sys/dev/raidframe/rf_raid1.c
+++ b/sys/dev/raidframe/rf_raid1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_raid1.c,v 1.5 2002/12/16 07:01:04 tdeval Exp $	*/
+/*	$OpenBSD: rf_raid1.c,v 1.6 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_raid1.c,v 1.5 2000/01/08 22:57:30 oster Exp $	*/
 
 /*
@@ -395,7 +395,7 @@ rf_VerifyParityRAID1(RF_Raid_t *raidPtr, RF_RaidAddr_t raidAddr,
 	}
 	RF_ASSERT(pda == NULL);
 
-	bzero((char *) &tracerec, sizeof(tracerec));
+	bzero(&tracerec, sizeof(tracerec));
 	rd_dag_h->tracerec = &tracerec;
 
 	if (rf_verifyParityDebug > 1) {
@@ -511,7 +511,7 @@ rf_VerifyParityRAID1(RF_Raid_t *raidPtr, RF_RaidAddr_t raidAddr,
 			    RF_CREATE_PARAM3(RF_IO_NORMAL_PRIORITY, 0, 0,
 			     which_ru);
 		}
-		bzero((char *) &tracerec, sizeof(tracerec));
+		bzero(&tracerec, sizeof(tracerec));
 		wr_dag_h->tracerec = &tracerec;
 		if (rf_verifyParityDebug > 1) {
 			printf("Parity verify write dag:\n");
diff --git a/sys/dev/raidframe/rf_reconmap.c b/sys/dev/raidframe/rf_reconmap.c
index 3288c501ff7..808b0b46731 100644
--- a/sys/dev/raidframe/rf_reconmap.c
+++ b/sys/dev/raidframe/rf_reconmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_reconmap.c,v 1.4 2002/12/16 07:01:05 tdeval Exp $	*/
+/*	$OpenBSD: rf_reconmap.c,v 1.5 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_reconmap.c,v 1.6 1999/08/14 21:44:24 oster Exp $	*/
 
 /*
@@ -102,7 +102,7 @@ rf_MakeReconMap(
 	    (RF_ReconMapListElem_t **));
 	RF_ASSERT(p->status != (RF_ReconMapListElem_t **) NULL);
 
-	(void) bzero((char *) p->status, num_rus *
+	bzero(p->status, num_rus *
 	    sizeof(RF_ReconMapListElem_t *));
 
 	p->size = sizeof(RF_ReconMap_t) + num_rus *
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c
index c8089abb61c..4ce37b12ced 100644
--- a/sys/dev/raidframe/rf_reconstruct.c
+++ b/sys/dev/raidframe/rf_reconstruct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_reconstruct.c,v 1.17 2010/05/23 13:49:35 naddy Exp $	*/
+/*	$OpenBSD: rf_reconstruct.c,v 1.18 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_reconstruct.c,v 1.26 2000/06/04 02:05:13 oster Exp $	*/
 
 /*
@@ -1165,7 +1165,7 @@ rf_IssueNextReadRequest(RF_Raid_t *raidPtr, RF_RowCol_t row, RF_RowCol_t col)
 	 */
 	rbuf->parityStripeID = ctrl->curPSID;
 	rbuf->which_ru = ctrl->ru_count;
-	bzero((char *) &raidPtr->recon_tracerecs[col],
+	bzero(&raidPtr->recon_tracerecs[col],
 	    sizeof(raidPtr->recon_tracerecs[col]));
 	raidPtr->recon_tracerecs[col].reconacc = 1;
 	RF_ETIMER_START(raidPtr->recon_tracerecs[col].recon_timer);
diff --git a/sys/dev/raidframe/rf_utils.c b/sys/dev/raidframe/rf_utils.c
index c136b0fe7fa..92769e0d80b 100644
--- a/sys/dev/raidframe/rf_utils.c
+++ b/sys/dev/raidframe/rf_utils.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rf_utils.c,v 1.5 2002/12/16 07:01:05 tdeval Exp $	*/
+/*	$OpenBSD: rf_utils.c,v 1.6 2011/06/21 16:46:00 tedu Exp $	*/
 /*	$NetBSD: rf_utils.c,v 1.5 2000/01/07 03:41:03 oster Exp $	*/
 
 /*
@@ -55,7 +55,7 @@ rf_make_2d_array(int b, int k, RF_AllocListElem_t *allocList)
 	for (i = 0; i < b; i++) {
 		RF_MallocAndAdd(retval[i], k * sizeof(RF_RowCol_t),
 		    (RF_RowCol_t *), allocList);
-		bzero((char *) retval[i], k * sizeof(RF_RowCol_t));
+		bzero(retval[i], k * sizeof(RF_RowCol_t));
 	}
 	return (retval);
 }
@@ -78,7 +78,7 @@ rf_make_1d_array(int c, RF_AllocListElem_t *allocList)
 
 	RF_MallocAndAdd(retval, c * sizeof(RF_RowCol_t), (RF_RowCol_t *),
 	    allocList);
-	bzero((char *) retval, c * sizeof(RF_RowCol_t));
+	bzero(retval, c * sizeof(RF_RowCol_t));
 	return (retval);
 }