From ca4a8cf38604bd81541474c8adaffbed30ede944 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Thu, 24 Feb 2005 21:32:56 +0000
Subject: Return BUS_PROBE_DEFAULT instead of 0.

---
 sys/pci/agp_ali.c    |  2 +-
 sys/pci/agp_amd.c    |  2 +-
 sys/pci/agp_amd64.c  |  2 +-
 sys/pci/agp_i810.c   |  2 +-
 sys/pci/agp_intel.c  |  2 +-
 sys/pci/agp_nvidia.c |  2 +-
 sys/pci/agp_sis.c    |  2 +-
 sys/pci/agp_via.c    |  2 +-
 sys/pci/alpm.c       |  2 +-
 sys/pci/amdpm.c      |  4 ++--
 sys/pci/if_dc.c      |  2 +-
 sys/pci/if_de.c      |  2 +-
 sys/pci/if_mn.c      |  2 +-
 sys/pci/if_pcn.c     |  2 +-
 sys/pci/if_rl.c      |  2 +-
 sys/pci/if_sf.c      | 12 ++++++------
 sys/pci/if_sis.c     |  2 +-
 sys/pci/if_sk.c      |  4 ++--
 sys/pci/if_ste.c     |  2 +-
 sys/pci/if_ti.c      |  2 +-
 sys/pci/if_tl.c      |  2 +-
 sys/pci/if_vr.c      |  2 +-
 sys/pci/if_wb.c      |  2 +-
 sys/pci/if_xl.c      |  2 +-
 sys/pci/intpm.c      |  4 ++--
 sys/pci/ncr.c        |  2 +-
 sys/pci/viapm.c      |  4 ++--
 sys/pci/xrpu.c       |  2 +-
 28 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'sys/pci')

diff --git a/sys/pci/agp_ali.c b/sys/pci/agp_ali.c
index fcf145d..608430c 100644
--- a/sys/pci/agp_ali.c
+++ b/sys/pci/agp_ali.c
@@ -85,7 +85,7 @@ agp_ali_probe(device_t dev)
 	if (desc) {
 		device_verbose(dev);
 		device_set_desc(dev, desc);
-		return 0;
+		return BUS_PROBE_DEFAULT;
 	}
 
 	return ENXIO;
diff --git a/sys/pci/agp_amd.c b/sys/pci/agp_amd.c
index c876026..bb1d20e 100644
--- a/sys/pci/agp_amd.c
+++ b/sys/pci/agp_amd.c
@@ -209,7 +209,7 @@ agp_amd_probe(device_t dev)
 	if (desc) {
 		device_verbose(dev);
 		device_set_desc(dev, desc);
-		return 0;
+		return BUS_PROBE_DEFAULT;
 	}
 
 	return ENXIO;
diff --git a/sys/pci/agp_amd64.c b/sys/pci/agp_amd64.c
index 97be619..2224aff 100644
--- a/sys/pci/agp_amd64.c
+++ b/sys/pci/agp_amd64.c
@@ -103,7 +103,7 @@ agp_amd64_probe(device_t dev)
 	if ((desc = agp_amd64_match(dev))) {
 		device_verbose(dev);
 		device_set_desc(dev, desc);
-		return 0;
+		return BUS_PROBE_DEFAULT;
 	}
 
 	return ENXIO;
diff --git a/sys/pci/agp_i810.c b/sys/pci/agp_i810.c
index 14ecfb2..3cb8fd4 100644
--- a/sys/pci/agp_i810.c
+++ b/sys/pci/agp_i810.c
@@ -236,7 +236,7 @@ agp_i810_probe(device_t dev)
 
 		device_verbose(dev);
 		device_set_desc(dev, desc);
-		return 0;
+		return BUS_PROBE_DEFAULT;
 	}
 
 	return ENXIO;
diff --git a/sys/pci/agp_intel.c b/sys/pci/agp_intel.c
index 916c1a7..7e8477b 100644
--- a/sys/pci/agp_intel.c
+++ b/sys/pci/agp_intel.c
@@ -133,7 +133,7 @@ agp_intel_probe(device_t dev)
 	if (desc) {
 		device_verbose(dev);
 		device_set_desc(dev, desc);
-		return 0;
+		return BUS_PROBE_DEFAULT;
 	}
 
 	return ENXIO;
diff --git a/sys/pci/agp_nvidia.c b/sys/pci/agp_nvidia.c
index 5b6c96d..dfec868 100644
--- a/sys/pci/agp_nvidia.c
+++ b/sys/pci/agp_nvidia.c
@@ -123,7 +123,7 @@ agp_nvidia_probe (device_t dev)
 	if (desc) {
 		device_verbose(dev);
 		device_set_desc(dev, desc);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 	return (ENXIO);
 }
diff --git a/sys/pci/agp_sis.c b/sys/pci/agp_sis.c
index eec6d81..0f3b31a 100644
--- a/sys/pci/agp_sis.c
+++ b/sys/pci/agp_sis.c
@@ -121,7 +121,7 @@ agp_sis_probe(device_t dev)
 	if (desc) {
 		device_verbose(dev);
 		device_set_desc(dev, desc);
-		return 0;
+		return BUS_PROBE_DEFAULT;
 	}
 
 	return ENXIO;
diff --git a/sys/pci/agp_via.c b/sys/pci/agp_via.c
index a2cb739..118b906 100644
--- a/sys/pci/agp_via.c
+++ b/sys/pci/agp_via.c
@@ -145,7 +145,7 @@ agp_via_probe(device_t dev)
 	if (desc) {
 		device_verbose(dev);
 		device_set_desc(dev, desc);
-		return 0;
+		return BUS_PROBE_DEFAULT;
 	}
 
 	return ENXIO;
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index 7a062e3..9a0e537 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -166,7 +166,7 @@ alpm_probe(device_t dev)
 			return (ENXIO);
 		}
 #endif
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 
 	return (ENXIO);
diff --git a/sys/pci/amdpm.c b/sys/pci/amdpm.c
index 5333e67..22ca103 100644
--- a/sys/pci/amdpm.c
+++ b/sys/pci/amdpm.c
@@ -163,7 +163,7 @@ amdpm_probe(device_t dev)
 		base &= 0xff00;
 		bus_set_resource(dev, SYS_RES_IOPORT, AMDPCI_PMBASE,
 				 base+0xe0, 32);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 
 	if ((vid == AMDPM_VENDORID_NVIDIA) &&
@@ -179,7 +179,7 @@ amdpm_probe(device_t dev)
 		bus_set_resource(dev, SYS_RES_IOPORT, NFPCI_PMBASE,
 				 base, 32);
 
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 
 	return ENXIO;
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index 6d0abb3..bd62d3f 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -1621,7 +1621,7 @@ dc_probe(device_t dev)
 
 	if (t != NULL) {
 		device_set_desc(dev, t->dc_name);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 
 	return (ENXIO);
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index afeacae..da2310f 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -4994,7 +4994,7 @@ tulip_pci_probe(device_t dev)
     }
     if (name) {
 	device_set_desc(dev, name);
-	return -200;
+	return BUS_PROBE_LOW_PRIORITY;
     }
     return ENXIO;
 }
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index 6f25f6a..2a4ce91 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -1319,7 +1319,7 @@ mn_probe (device_t self)
 		return (ENXIO);
 
 	device_set_desc_copy(self, "Munich32X E1/T1 HDLC Controller");
-	return (0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index 39ce10c..93d30d8 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -521,7 +521,7 @@ pcn_probe(dev)
 		return(ENXIO);
 	}
 	device_set_desc(dev, t->pcn_name);
-	return(0);
+	return(BUS_PROBE_DEFAULT);
 }
 
 /*
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index c12fc4f..d71d26b 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -772,7 +772,7 @@ rl_probe(device_t dev)
 			}
 
 			device_set_desc(dev, t->rl_name);
-			return (0);
+			return (BUS_PROBE_DEFAULT);
 		}
 		t++;
 	}
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 40e1dd0..539ecdb 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -603,27 +603,27 @@ sf_probe(dev)
 			case AD_SUBSYSID_62011_REV1:
 				device_set_desc(dev,
 				    "Adaptec ANA-62011 10/100BaseTX");
-				return(0);
+				return (BUS_PROBE_DEFAULT);
 			case AD_SUBSYSID_62022:
 				device_set_desc(dev,
 				    "Adaptec ANA-62022 10/100BaseTX");
-				return(0);
+				return (BUS_PROBE_DEFAULT);
 			case AD_SUBSYSID_62044_REV0:
 			case AD_SUBSYSID_62044_REV1:
 				device_set_desc(dev,
 				    "Adaptec ANA-62044 10/100BaseTX");
-				return(0);
+				return (BUS_PROBE_DEFAULT);
 			case AD_SUBSYSID_62020:
 				device_set_desc(dev,
 				    "Adaptec ANA-62020 10/100BaseFX");
-				return(0);
+				return (BUS_PROBE_DEFAULT);
 			case AD_SUBSYSID_69011:
 				device_set_desc(dev,
 				    "Adaptec ANA-69011 10/100BaseTX");
-				return(0);
+				return (BUS_PROBE_DEFAULT);
 			default:
 				device_set_desc(dev, t->sf_name);
-				return(0);
+				return (BUS_PROBE_DEFAULT);
 				break;
 			}
 		}
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 4c1609c..1a3e12f 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -879,7 +879,7 @@ sis_probe(device_t dev)
 		if ((pci_get_vendor(dev) == t->sis_vid) &&
 		    (pci_get_device(dev) == t->sis_did)) {
 			device_set_desc(dev, t->sis_name);
-			return(0);
+			return (BUS_PROBE_DEFAULT);
 		}
 		t++;
 	}
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 29e345b..2529cc5 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -1243,7 +1243,7 @@ skc_probe(dev)
 		if ((pci_get_vendor(dev) == t->sk_vid) &&
 		    (pci_get_device(dev) == t->sk_did)) {
 			device_set_desc(dev, t->sk_name);
-			return(0);
+			return (BUS_PROBE_DEFAULT);
 		}
 		t++;
 	}
@@ -1321,7 +1321,7 @@ sk_probe(dev)
 		break;
 	}
 
-	return(0);
+	return (BUS_PROBE_DEFAULT);
 }
 
 /*
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index b92521b..660627f 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -969,7 +969,7 @@ ste_probe(dev)
 		if ((pci_get_vendor(dev) == t->ste_vid) &&
 		    (pci_get_device(dev) == t->ste_did)) {
 			device_set_desc(dev, t->ste_name);
-			return(0);
+			return (BUS_PROBE_DEFAULT);
 		}
 		t++;
 	}
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index d368d84..856dab9 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -2022,7 +2022,7 @@ ti_probe(dev)
 		if ((pci_get_vendor(dev) == t->ti_vid) &&
 		    (pci_get_device(dev) == t->ti_did)) {
 			device_set_desc(dev, t->ti_name);
-			return (0);
+			return (BUS_PROBE_DEFAULT);
 		}
 		t++;
 	}
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index dfccac4..187c905 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -1100,7 +1100,7 @@ tl_probe(dev)
 		if ((pci_get_vendor(dev) == t->tl_vid) &&
 		    (pci_get_device(dev) == t->tl_did)) {
 			device_set_desc(dev, t->tl_name);
-			return(0);
+			return (BUS_PROBE_DEFAULT);
 		}
 		t++;
 	}
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index 95a4466..ac13ec1 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -626,7 +626,7 @@ vr_probe(device_t dev)
 		if ((pci_get_vendor(dev) == t->vr_vid) &&
 		    (pci_get_device(dev) == t->vr_did)) {
 			device_set_desc(dev, t->vr_name);
-			return (0);
+			return (BUS_PROBE_DEFAULT);
 		}
 		t++;
 	}
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index 266cfcb..abd8bac 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -772,7 +772,7 @@ wb_probe(dev)
 		if ((pci_get_vendor(dev) == t->wb_vid) &&
 		    (pci_get_device(dev) == t->wb_did)) {
 			device_set_desc(dev, t->wb_name);
-			return(0);
+			return (BUS_PROBE_DEFAULT);
 		}
 		t++;
 	}
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 883aea5..3cd39da 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -1062,7 +1062,7 @@ xl_probe(device_t dev)
 		if ((pci_get_vendor(dev) == t->xl_vid) &&
 		    (pci_get_device(dev) == t->xl_did)) {
 			device_set_desc(dev, t->xl_name);
-			return (0);
+			return (BUS_PROBE_DEFAULT);
 		}
 		t++;
 	}
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index ef30a52..cbe622b 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -156,7 +156,7 @@ intsmb_probe(device_t dev)
                 return (EINVAL);    /* XXX don't know what to return else */
         device_set_desc(dev,"Intel PIIX4 SMBUS Interface");
         
-        return (0);          /* XXX don't know what to return else */
+        return (BUS_PROBE_DEFAULT); /* XXX don't know what to return else */
 }
 static int
 intsmb_attach(device_t dev)
@@ -735,7 +735,7 @@ intpm_probe(device_t dev)
     if(ep->desc!=NULL){
       device_set_desc(dev,ep->desc);
       bus_set_resource(dev,SYS_RES_IRQ,0,9,1); /* XXX setup intr resource */
-      return 0;
+      return (BUS_PROBE_DEFAULT);
     }else{
       return ENXIO;
     }
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index d1a9b9e..187bc8c 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -3291,7 +3291,7 @@ static	int ncr_probe (device_t dev)
 	i = ncr_chip_lookup(pci_get_devid(dev), pci_get_revid(dev));
 	if (i >= 0) {
 		device_set_desc(dev, ncr_chip_table[i].name);
-		return (0);
+		return (BUS_PROBE_DEFAULT);
 	}
 
 	return (ENXIO);
diff --git a/sys/pci/viapm.c b/sys/pci/viapm.c
index f6c061d..522d057 100644
--- a/sys/pci/viapm.c
+++ b/sys/pci/viapm.c
@@ -227,7 +227,7 @@ viapm_586b_probe(device_t dev)
 			return ENXIO;
 		}
 		device_set_desc(dev, "VIA VT82C586B Power Management Unit");
-		return 0;
+		return (BUS_PROBE_DEFAULT);
 
 	default:
 		break;
@@ -306,7 +306,7 @@ viapm_pro_probe(device_t dev)
 		}
 
 		device_set_desc(dev, desc);
-		return 0;
+		return (BUS_PROBE_DEFAULT);
 
 	default:
 		break;
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index 1394291..0ca567f 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -215,7 +215,7 @@ xrpu_probe(device_t self)
 		return ENXIO;
 
 	device_set_desc(self, desc);
-	return 0;
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
-- 
cgit v1.1