svn commit: r188460 - head/sys/dev/arcmsr

[Warner Losh]

Author: imp
Date: Tue Feb 10 22:46:36 2009
New Revision: 188460
URL: http://svn.freebsd.org/changeset/base/188460

Log:
  fix arcmsr_attach, probe, detach, and shutdown prototypes to match newbus.

Modified:
  head/sys/dev/arcmsr/arcmsr.c

Modified: head/sys/dev/arcmsr/arcmsr.c
==============================================================================
--- head/sys/dev/arcmsr/arcmsr.c	Tue Feb 10 22:46:33 2009	(r188459)
+++ head/sys/dev/arcmsr/arcmsr.c	Tue Feb 10 22:46:36 2009	(r188460)
@@ -140,12 +140,12 @@
 */
 static struct CommandControlBlock * arcmsr_get_freesrb(struct AdapterControlBlock *acb);
 static u_int8_t arcmsr_seek_cmd2abort(union ccb * abortccb);
-static u_int32_t arcmsr_probe(device_t dev);
-static u_int32_t arcmsr_attach(device_t dev);
-static u_int32_t arcmsr_detach(device_t dev);
+static int arcmsr_probe(device_t dev);
+static int arcmsr_attach(device_t dev);
+static int arcmsr_detach(device_t dev);
 static u_int32_t arcmsr_iop_ioctlcmd(struct AdapterControlBlock *acb, u_int32_t ioctl_cmd, caddr_t arg);
 static void arcmsr_iop_parking(struct AdapterControlBlock *acb);
-static void arcmsr_shutdown(device_t dev);
+static int arcmsr_shutdown(device_t dev);
 static void arcmsr_interrupt(struct AdapterControlBlock *acb);
 static void arcmsr_polling_srbdone(struct AdapterControlBlock *acb, struct CommandControlBlock *poll_srb);
 static void arcmsr_free_resource(struct AdapterControlBlock *acb);
@@ -3029,7 +3029,7 @@ static u_int32_t arcmsr_initialize(devic
 ************************************************************************
 ************************************************************************
 */
-static u_int32_t arcmsr_attach(device_t dev)
+static int arcmsr_attach(device_t dev)
 {
 	struct AdapterControlBlock *acb=(struct AdapterControlBlock *)device_get_softc(dev);
 	u_int32_t unit=device_get_unit(dev);
@@ -3152,7 +3152,7 @@ static u_int32_t arcmsr_attach(device_t 
 ************************************************************************
 ************************************************************************
 */
-static u_int32_t arcmsr_probe(device_t dev)
+static int arcmsr_probe(device_t dev)
 {
 	u_int32_t id;
 	static char buf[256];
@@ -3197,7 +3197,7 @@ static u_int32_t arcmsr_probe(device_t d
 ************************************************************************
 ************************************************************************
 */
-static void arcmsr_shutdown(device_t dev)
+static int arcmsr_shutdown(device_t dev)
 {
 	u_int32_t  i;
 	u_int32_t intmask_org;
@@ -3231,13 +3231,13 @@ static void arcmsr_shutdown(device_t dev
 	acb->workingsrb_doneindex=0;
 	acb->workingsrb_startindex=0;
 	ARCMSR_LOCK_RELEASE(&acb->qbuffer_lock);
-	return;
+	return (0);
 }
 /*
 ************************************************************************
 ************************************************************************
 */
-static u_int32_t arcmsr_detach(device_t dev)
+static int arcmsr_detach(device_t dev)
 {
 	struct AdapterControlBlock *acb=(struct AdapterControlBlock *)device_get_softc(dev);
 	int i;