From owner-svn-src-all@FreeBSD.ORG  Wed Sep 19 18:25:26 2012
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 3BD39106564A;
	Wed, 19 Sep 2012 18:25:26 +0000 (UTC)
	(envelope-from jimharris@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 276F18FC16;
	Wed, 19 Sep 2012 18:25:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8JIPPEq043523;
	Wed, 19 Sep 2012 18:25:25 GMT
	(envelope-from jimharris@svn.freebsd.org)
Received: (from jimharris@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8JIPPog043521;
	Wed, 19 Sep 2012 18:25:25 GMT
	(envelope-from jimharris@svn.freebsd.org)
Message-Id: <201209191825.q8JIPPog043521@svn.freebsd.org>
From: Jim Harris <jimharris@FreeBSD.org>
Date: Wed, 19 Sep 2012 18:25:25 +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: r240700 - head/sys/dev/nvme
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: Wed, 19 Sep 2012 18:25:26 -0000

Author: jimharris
Date: Wed Sep 19 18:25:25 2012
New Revision: 240700
URL: http://svn.freebsd.org/changeset/base/240700

Log:
  In nvme(4), set device description for BUS_PROBE_GENERIC case.
  
  Reported by:	jhb

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

Modified: head/sys/dev/nvme/nvme.c
==============================================================================
--- head/sys/dev/nvme/nvme.c	Wed Sep 19 18:22:14 2012	(r240699)
+++ head/sys/dev/nvme/nvme.c	Wed Sep 19 18:25:25 2012	(r240700)
@@ -84,28 +84,29 @@ static int
 nvme_probe (device_t device)
 {
 	struct _pcsid	*ep;
-	int		probe_val = ENXIO;
 	u_int32_t	type;
 
 	type = pci_get_devid(device);
 	ep = pci_ids;
 
-#if defined(PCIS_STORAGE_NVM)
-	if (pci_get_class(device)    == PCIC_STORAGE &&
-	    pci_get_subclass(device) == PCIS_STORAGE_NVM &&
-	    pci_get_progif(device)   == PCIP_STORAGE_NVM_ENTERPRISE_NVMHCI_1_0)
-		probe_val = BUS_PROBE_GENERIC;
-#endif
-
 	while (ep->type && ep->type != type)
 		++ep;
 
 	if (ep->desc) {
 		device_set_desc(device, ep->desc);
-		probe_val = BUS_PROBE_DEFAULT;
+		return (BUS_PROBE_DEFAULT);
 	}
 
-	return (probe_val);
+#if defined(PCIS_STORAGE_NVM)
+	if (pci_get_class(device)    == PCIC_STORAGE &&
+	    pci_get_subclass(device) == PCIS_STORAGE_NVM &&
+	    pci_get_progif(device)   == PCIP_STORAGE_NVM_ENTERPRISE_NVMHCI_1_0) {
+		device_set_desc(device, "Generic NVMe Device");
+		return (BUS_PROBE_GENERIC);
+	}
+#endif
+
+	return (ENXIO);
 }
 
 static void