From owner-svn-src-all@FreeBSD.ORG  Tue Dec 28 16:57:30 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 42A8A1065693;
	Tue, 28 Dec 2010 16:57:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 320378FC08;
	Tue, 28 Dec 2010 16:57:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBSGvUOM067725;
	Tue, 28 Dec 2010 16:57:30 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBSGvUPO067723;
	Tue, 28 Dec 2010 16:57:30 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201012281657.oBSGvUPO067723@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 28 Dec 2010 16:57:30 +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: r216764 - head/sys/dev/mpt
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Dec 2010 16:57:30 -0000

Author: jhb
Date: Tue Dec 28 16:57:29 2010
New Revision: 216764
URL: http://svn.freebsd.org/changeset/base/216764

Log:
  Use bus_alloc_resource_any().
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/mpt/mpt_pci.c

Modified: head/sys/dev/mpt/mpt_pci.c
==============================================================================
--- head/sys/dev/mpt/mpt_pci.c	Tue Dec 28 14:58:08 2010	(r216763)
+++ head/sys/dev/mpt/mpt_pci.c	Tue Dec 28 16:57:29 2010	(r216764)
@@ -523,8 +523,8 @@ mpt_pci_attach(device_t dev)
 	 * some cards otherwise).
 	 */
 	mpt->pci_pio_rid = PCIR_BAR(mpt_io_bar);
-	mpt->pci_pio_reg = bus_alloc_resource(dev, SYS_RES_IOPORT,
-			    &mpt->pci_pio_rid, 0, ~0, 0, RF_ACTIVE);
+	mpt->pci_pio_reg = bus_alloc_resource_any(dev, SYS_RES_IOPORT,
+			    &mpt->pci_pio_rid, RF_ACTIVE);
 	if (mpt->pci_pio_reg == NULL) {
 		device_printf(dev, "unable to map registers in PIO mode\n");
 		goto bad;
@@ -534,8 +534,8 @@ mpt_pci_attach(device_t dev)
 
 	/* Allocate kernel virtual memory for the 9x9's Mem0 region */
 	mpt->pci_mem_rid = PCIR_BAR(mpt_mem_bar);
-	mpt->pci_reg = bus_alloc_resource(dev, SYS_RES_MEMORY,
-			&mpt->pci_mem_rid, 0, ~0, 0, RF_ACTIVE);
+	mpt->pci_reg = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+			&mpt->pci_mem_rid, RF_ACTIVE);
 	if (mpt->pci_reg == NULL) {
 		device_printf(dev, "Unable to memory map registers.\n");
 		if (mpt->is_sas) {