From e800226bf674a18af1b631b7840221bf38b88cd2 Mon Sep 17 00:00:00 2001
From: oster <oster@NetBSD.org>
Date: Sun, 13 Feb 2005 20:27:48 +0000
Subject: [PATCH] Convert a few "void *"'s to "struct buf *"'s.  No functional
 changes.

---
 sys/dev/raidframe/rf_desc.h   | 5 ++---
 sys/dev/raidframe/rf_driver.c | 7 +++----
 sys/dev/raidframe/rf_driver.h | 5 +++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/sys/dev/raidframe/rf_desc.h b/sys/dev/raidframe/rf_desc.h
index ae9f0a9b5240..06c177e78f23 100644
--- a/sys/dev/raidframe/rf_desc.h
+++ b/sys/dev/raidframe/rf_desc.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_desc.h,v 1.16 2004/12/12 20:53:15 oster Exp $	*/
+/*	$NetBSD: rf_desc.h,v 1.17 2005/02/13 20:27:48 oster Exp $	*/
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -84,8 +84,7 @@ struct RF_RaidAccessDesc_s {
 						 be cleaned up at the end of
 						 this IO */
 	RF_AccessStripeMapHeader_t *asmap;	/* the asm for this I/O */
-	void   *bp;		/* buf pointer for this RAID acc.  ignored
-				 * outside the kernel */
+	struct buf *bp;		/* buf pointer for this RAID acc */
 	RF_AccTraceEntry_t tracerec;	/* perf monitoring information for a
 					 * user access (not for dag stats) */
 	void    (*callbackFunc) (RF_CBParam_t);	/* callback function for this
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c
index 81b7f090cd24..42d9c0217eb5 100644
--- a/sys/dev/raidframe/rf_driver.c
+++ b/sys/dev/raidframe/rf_driver.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_driver.c,v 1.105 2004/11/16 16:45:51 oster Exp $	*/
+/*	$NetBSD: rf_driver.c,v 1.106 2005/02/13 20:27:48 oster Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -73,7 +73,7 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.105 2004/11/16 16:45:51 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.106 2005/02/13 20:27:48 oster Exp $");
 
 #include "opt_raid_diagnostic.h"
 
@@ -636,11 +636,10 @@ rf_FreeRaidAccDesc(RF_RaidAccessDesc_t *desc)
 int 
 rf_DoAccess(RF_Raid_t * raidPtr, RF_IoType_t type, int async_flag,
 	    RF_RaidAddr_t raidAddress, RF_SectorCount_t numBlocks,
-	    caddr_t bufPtr, void *bp_in, RF_RaidAccessFlags_t flags)
+	    caddr_t bufPtr, struct buf *bp, RF_RaidAccessFlags_t flags)
 {
 	RF_RaidAccessDesc_t *desc;
 	caddr_t lbufPtr = bufPtr;
-	struct buf *bp = (struct buf *) bp_in;
 
 	raidAddress += rf_raidSectorOffset;
 
diff --git a/sys/dev/raidframe/rf_driver.h b/sys/dev/raidframe/rf_driver.h
index 4a4464d7848a..e0e4c794b07e 100644
--- a/sys/dev/raidframe/rf_driver.h
+++ b/sys/dev/raidframe/rf_driver.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_driver.h,v 1.13 2004/11/16 16:45:52 oster Exp $	*/
+/*	$NetBSD: rf_driver.h,v 1.14 2005/02/13 20:27:48 oster Exp $	*/
 /*
  * rf_driver.h
  */
@@ -53,7 +53,8 @@ RF_RaidAccessDesc_t *rf_AllocRaidAccDesc(RF_Raid_t *, RF_IoType_t,
 					 const RF_AccessState_t *);
 void rf_FreeRaidAccDesc(RF_RaidAccessDesc_t *);
 int rf_DoAccess(RF_Raid_t *, RF_IoType_t, int, RF_RaidAddr_t, 
-		RF_SectorCount_t, caddr_t, void *, RF_RaidAccessFlags_t);
+		RF_SectorCount_t, caddr_t, struct buf *,
+		RF_RaidAccessFlags_t);
 #if 0
 int rf_SetReconfiguredMode(RF_Raid_t *, RF_RowCol_t, RF_RowCol_t);
 #endif