From owner-svn-src-all@FreeBSD.ORG  Tue Jan 20 00:05:44 2009
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 1C2E81065670;
	Tue, 20 Jan 2009 00:05:44 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0A7AF8FC16;
	Tue, 20 Jan 2009 00:05:44 +0000 (UTC)
	(envelope-from nwhitehorn@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 n0K05hUC025669;
	Tue, 20 Jan 2009 00:05:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0K05hUG025667;
	Tue, 20 Jan 2009 00:05:43 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200901200005.n0K05hUG025667@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 20 Jan 2009 00:05:43 +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: r187457 - in head/sys/dev: iicbus pci
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, 20 Jan 2009 00:05:44 -0000

Author: nwhitehorn
Date: Tue Jan 20 00:05:43 2009
New Revision: 187457
URL: http://svn.freebsd.org/changeset/base/187457

Log:
  Change the probe priority for PCI and I2C generic bus modules from
  numerical constants to BUS_PROBE_GENERIC.
  
  Suggested by:	jhb

Modified:
  head/sys/dev/iicbus/iicbus.c
  head/sys/dev/pci/pci.c

Modified: head/sys/dev/iicbus/iicbus.c
==============================================================================
--- head/sys/dev/iicbus/iicbus.c	Tue Jan 20 00:03:52 2009	(r187456)
+++ head/sys/dev/iicbus/iicbus.c	Tue Jan 20 00:05:43 2009	(r187457)
@@ -55,7 +55,7 @@ iicbus_probe(device_t dev)
 	device_set_desc(dev, "Philips I2C bus");
 
 	/* Allow other subclasses to override this driver. */
-	return (-1000);
+	return (BUS_PROBE_GENERIC);
 }
 
 #if SCAN_IICBUS

Modified: head/sys/dev/pci/pci.c
==============================================================================
--- head/sys/dev/pci/pci.c	Tue Jan 20 00:03:52 2009	(r187456)
+++ head/sys/dev/pci/pci.c	Tue Jan 20 00:05:43 2009	(r187457)
@@ -2644,7 +2644,7 @@ pci_probe(device_t dev)
 	device_set_desc(dev, "PCI bus");
 
 	/* Allow other subclasses to override this driver. */
-	return (-1000);
+	return (BUS_PROBE_GENERIC);
 }
 
 static int