From owner-svn-src-head@FreeBSD.ORG  Mon Apr 27 21:34:15 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 E7244106564A;
	Mon, 27 Apr 2009 21:34:15 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D58D78FC13;
	Mon, 27 Apr 2009 21:34:15 +0000 (UTC)
	(envelope-from jkim@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 n3RLYFYS027484;
	Mon, 27 Apr 2009 21:34:15 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3RLYFGr027482;
	Mon, 27 Apr 2009 21:34:15 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200904272134.n3RLYFGr027482@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 27 Apr 2009 21:34:15 +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: r191600 - in head/sys/dev/ata: . chipsets
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: Mon, 27 Apr 2009 21:34:16 -0000

Author: jkim
Date: Mon Apr 27 21:34:15 2009
New Revision: 191600
URL: http://svn.freebsd.org/changeset/base/191600

Log:
  - Give generic AHCI driver lower priority than device-specific drivers.
  - Consistently use BUS_PROBE_GENERIC instead of -100.

Modified:
  head/sys/dev/ata/ata-pci.c
  head/sys/dev/ata/chipsets/ata-ahci.c

Modified: head/sys/dev/ata/ata-pci.c
==============================================================================
--- head/sys/dev/ata/ata-pci.c	Mon Apr 27 21:04:16 2009	(r191599)
+++ head/sys/dev/ata/ata-pci.c	Mon Apr 27 21:34:15 2009	(r191600)
@@ -70,18 +70,18 @@ ata_pci_probe(device_t dev)
 
     /* is this a storage class device ? */
     if (pci_get_class(dev) != PCIC_STORAGE)
-	return ENXIO;
+	return (ENXIO);
 
     /* is this an IDE/ATA type device ? */
     if (pci_get_subclass(dev) != PCIS_STORAGE_IDE)
-	return ENXIO;
+	return (ENXIO);
     
     sprintf(buffer, "%s ATA controller", ata_pcivendor2str(dev));
     device_set_desc_copy(dev, buffer);
     ctlr->chipinit = ata_generic_chipinit;
 
     /* we are a low priority handler */
-    return -100;
+    return (BUS_PROBE_GENERIC);
 }
 
 int

Modified: head/sys/dev/ata/chipsets/ata-ahci.c
==============================================================================
--- head/sys/dev/ata/chipsets/ata-ahci.c	Mon Apr 27 21:04:16 2009	(r191599)
+++ head/sys/dev/ata/chipsets/ata-ahci.c	Mon Apr 27 21:34:15 2009	(r191600)
@@ -85,7 +85,7 @@ ata_ahci_probe(device_t dev)
 
     /* is this PCI device flagged as an AHCI compliant chip ? */
     if (pci_read_config(dev, PCIR_PROGIF, 1) != PCIP_STORAGE_SATA_AHCI_1_0)
-	return ENXIO;
+	return (ENXIO);
 
     if (bootverbose)
 	sprintf(buffer, "%s (ID=%08x) AHCI controller", 
@@ -94,7 +94,7 @@ ata_ahci_probe(device_t dev)
 	sprintf(buffer, "%s AHCI controller", ata_pcivendor2str(dev));
     device_set_desc_copy(dev, buffer);
     ctlr->chipinit = ata_ahci_chipinit;
-    return 0;
+    return (BUS_PROBE_GENERIC);
 }
 
 int