From 494f3ca1827d04ed83305a44a506f31ffddd5179 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 5 Mar 2005 19:24:22 +0000
Subject: [PATCH] Use BUS_PROBE_DEFAULT for pci probe return value

---
 sys/dev/aac/aac_pci.c      |  2 +-
 sys/dev/advansys/adv_pci.c | 10 +++++-----
 sys/dev/advansys/adw_pci.c |  2 +-
 sys/dev/aic7xxx/ahc_pci.c  |  2 +-
 sys/dev/aic7xxx/ahd_pci.c  |  2 +-
 sys/dev/amr/amr_pci.c      |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index 66ba9ab6725..b57756fc582 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -160,7 +160,7 @@ aac_pci_probe(device_t dev)
 					      pci_get_subdevice(dev))))) {
 		
 			device_set_desc(dev, m->desc);
-			return(-10);	/* allow room to be overridden */
+			return(BUS_PROBE_DEFAULT);
 		}
 	}
 	return(ENXIO);
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index aa97f1ba071..909a85c20ed 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -110,22 +110,22 @@ adv_pci_probe(device_t dev)
 	switch (pci_get_devid(dev)) {
 	case PCI_DEVICE_ID_ADVANSYS_1200A:
 		device_set_desc(dev, "AdvanSys ASC1200A SCSI controller");
-		return 0;
+		return BUS_PROBE_DEFAULT;
 	case PCI_DEVICE_ID_ADVANSYS_1200B:
 		device_set_desc(dev, "AdvanSys ASC1200B SCSI controller");
-		return 0;
+		return BUS_PROBE_DEFAULT;
 	case PCI_DEVICE_ID_ADVANSYS_3000:
 		if (rev == PCI_DEVICE_REV_ADVANSYS_3150) {
 			device_set_desc(dev,
 					"AdvanSys ASC3150 SCSI controller");
-			return 0;
+			return BUS_PROBE_DEFAULT;
 		} else if (rev == PCI_DEVICE_REV_ADVANSYS_3050) {
 			device_set_desc(dev,
 					"AdvanSys ASC3030/50 SCSI controller");
-			return 0;
+			return BUS_PROBE_DEFAULT;
 		} else if (rev >= PCI_DEVICE_REV_ADVANSYS_3150) {
 			device_set_desc(dev, "Unknown AdvanSys controller");
-			return 0;
+			return BUS_PROBE_DEFAULT;
 		}
 		break;
 	default:
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 1f88d772a79..2e5e2e76637 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -189,7 +189,7 @@ adw_pci_probe(device_t dev)
 	entry = adw_find_pci_device(dev);
 	if (entry != NULL) {
 		device_set_desc(dev, entry->name);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 	return (ENXIO);
 }
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index a9d4478420a..4a4889c4970 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -66,7 +66,7 @@ ahc_pci_probe(device_t dev)
 	entry = ahc_find_pci_device(dev);
 	if (entry != NULL) {
 		device_set_desc(dev, entry->name);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 	return (ENXIO);
 }
diff --git a/sys/dev/aic7xxx/ahd_pci.c b/sys/dev/aic7xxx/ahd_pci.c
index 01439442b7c..df7fd5c6ecc 100644
--- a/sys/dev/aic7xxx/ahd_pci.c
+++ b/sys/dev/aic7xxx/ahd_pci.c
@@ -68,7 +68,7 @@ ahd_pci_probe(device_t dev)
 	entry = ahd_find_pci_device(dev);
 	if (entry != NULL) {
 		device_set_desc(dev, entry->name);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 	return (ENXIO);
 }
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index c70159babfd..6fab69855b8 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -154,7 +154,7 @@ amr_pci_probe(device_t dev)
 		    continue;
 	    }
 	    device_set_desc(dev, LSI_DESC_PCI);
-	    return(-10);	/* allow room to be overridden */
+	    return(BUS_PROBE_DEFAULT);
 	}
     }
     return(ENXIO);