diff --git a/sys/dev/raidframe/rf_evenodd.c b/sys/dev/raidframe/rf_evenodd.c
index d4b2ef460196..aecd9c849ac1 100644
--- a/sys/dev/raidframe/rf_evenodd.c
+++ b/sys/dev/raidframe/rf_evenodd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_evenodd.c,v 1.9 2002/09/23 02:40:08 oster Exp $	*/
+/*	$NetBSD: rf_evenodd.c,v 1.10 2003/11/16 20:32:05 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
  ****************************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.9 2002/09/23 02:40:08 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.10 2003/11/16 20:32:05 oster Exp $");
 
 #include "rf_archs.h"
 
@@ -213,7 +213,7 @@ rf_EODagSelect(
 	RF_ASSERT(RF_IO_IS_R_OR_W(type));
 	if (ntfail > 2) {
 		RF_ERRORMSG("more than two disks failed in a single group!  Aborting I/O operation.\n");
-		 /* *infoFunc = */ *createFunc = NULL;
+		*createFunc = NULL;
 		return;
 	}
 	/* ok, we can do this I/O */
diff --git a/sys/dev/raidframe/rf_paritylogging.c b/sys/dev/raidframe/rf_paritylogging.c
index aa68dddfb443..ef16a733e98f 100644
--- a/sys/dev/raidframe/rf_paritylogging.c
+++ b/sys/dev/raidframe/rf_paritylogging.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_paritylogging.c,v 1.14 2002/09/23 02:40:08 oster Exp $	*/
+/*	$NetBSD: rf_paritylogging.c,v 1.15 2003/11/16 20:32:05 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.14 2002/09/23 02:40:08 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.15 2003/11/16 20:32:05 oster Exp $");
 
 #include "rf_archs.h"
 
@@ -943,7 +943,7 @@ rf_ParityLoggingDagSelect(
 
 	if (asmp->numDataFailed + asmp->numParityFailed > 1) {
 		RF_ERRORMSG("Multiple disks failed in a single group!  Aborting I/O operation.\n");
-		 /* *infoFunc = */ *createFunc = NULL;
+		*createFunc = NULL;
 		return;
 	} else
 		if (asmp->numDataFailed + asmp->numParityFailed == 1) {
diff --git a/sys/dev/raidframe/rf_pq.c b/sys/dev/raidframe/rf_pq.c
index 18a1c9d07125..86ffb45ac4bb 100644
--- a/sys/dev/raidframe/rf_pq.c
+++ b/sys/dev/raidframe/rf_pq.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_pq.c,v 1.12 2002/05/22 15:40:51 wiz Exp $	*/
+/*	$NetBSD: rf_pq.c,v 1.13 2003/11/16 20:32:05 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_pq.c,v 1.12 2002/05/22 15:40:51 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_pq.c,v 1.13 2003/11/16 20:32:05 oster Exp $");
 
 #include "rf_archs.h"
 
@@ -115,7 +115,7 @@ rf_PQDagSelect(
 	RF_ASSERT(RF_IO_IS_R_OR_W(type));
 	if (ntfail > 2) {
 		RF_ERRORMSG("more than two disks failed in a single group!  Aborting I/O operation.\n");
-		 /* *infoFunc = */ *createFunc = NULL;
+		*createFunc = NULL;
 		return;
 	}
 	/* ok, we can do this I/O */
@@ -146,7 +146,6 @@ rf_PQDagSelect(
 			break;
 		case 2:
 			/* lost two data units */
-			/* *infoFunc = PQOneTwo; */
 			*createFunc = (RF_VoidFuncPtr) rf_PQ_200_CreateReadDAG;
 			break;
 		}
diff --git a/sys/dev/raidframe/rf_raid5.c b/sys/dev/raidframe/rf_raid5.c
index d04d07bece5a..179de54e27a3 100644
--- a/sys/dev/raidframe/rf_raid5.c
+++ b/sys/dev/raidframe/rf_raid5.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_raid5.c,v 1.7 2002/09/23 02:40:09 oster Exp $	*/
+/*	$NetBSD: rf_raid5.c,v 1.8 2003/11/16 20:32:05 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -33,7 +33,7 @@
  *****************************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.7 2002/09/23 02:40:09 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.8 2003/11/16 20:32:05 oster Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -196,7 +196,7 @@ rf_RaidFiveDagSelect(
 
 	if (asmap->numDataFailed + asmap->numParityFailed > 1) {
 		RF_ERRORMSG("Multiple disks failed in a single group!  Aborting I/O operation.\n");
-		 /* *infoFunc = */ *createFunc = NULL;
+		*createFunc = NULL;
 		return;
 	} else
 		if (asmap->numDataFailed + asmap->numParityFailed == 1) {