From owner-svn-src-head@FreeBSD.ORG  Tue Feb 10 22:46:37 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5957C106566C;
	Tue, 10 Feb 2009 22:46:37 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4706D8FC0A;
	Tue, 10 Feb 2009 22:46:37 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1AMkbVT006563;
	Tue, 10 Feb 2009 22:46:37 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1AMkb0w006562;
	Tue, 10 Feb 2009 22:46:37 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200902102246.n1AMkb0w006562@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Tue, 10 Feb 2009 22:46:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188460 - head/sys/dev/arcmsr
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2009 22:46:38 -0000

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;