summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/tdfx/tdfx_pci.c14
-rw-r--r--sys/dev/tga/tga_pci.c2
-rw-r--r--sys/dev/trm/trm.c4
-rw-r--r--sys/dev/twa/twa_freebsd.c2
-rw-r--r--sys/dev/twe/twe_freebsd.c2
-rw-r--r--sys/dev/tx/if_tx.c2
-rw-r--r--sys/dev/txp/if_txp.c2
-rw-r--r--sys/dev/ubsec/ubsec.c6
-rw-r--r--sys/dev/usb/ehci_pci.c2
-rw-r--r--sys/dev/usb/ohci_pci.c2
-rw-r--r--sys/dev/usb/uhci_pci.c2
-rw-r--r--sys/dev/vge/if_vge.c2
-rw-r--r--sys/dev/vx/if_vx_pci.c10
-rw-r--r--sys/dev/wi/if_wi_pci.c2
14 files changed, 26 insertions, 28 deletions
diff --git a/sys/dev/tdfx/tdfx_pci.c b/sys/dev/tdfx/tdfx_pci.c
index 7ad6282..c0d7125 100644
--- a/sys/dev/tdfx/tdfx_pci.c
+++ b/sys/dev/tdfx/tdfx_pci.c
@@ -120,25 +120,25 @@ tdfx_probe(device_t dev)
/*
* probe routine called on kernel boot to register supported devices. We get
* a device structure to work with, and we can test the VENDOR/DEVICE IDs to
- * see if this PCI device is one that we support. Return 0 if yes, ENXIO if
- * not.
+ * see if this PCI device is one that we support. Return BUS_PRROBE_DEFAULT
+ * if yes, ENXIO if not.
*/
switch(pci_get_devid(dev)) {
case PCI_DEVICE_ALLIANCE_AT3D:
device_set_desc(dev, "ProMotion At3D 3D Accelerator");
- return 0;
+ return BUS_PROBE_DEFAULT;
case PCI_DEVICE_3DFX_VOODOO2:
device_set_desc(dev, "3DFX Voodoo II 3D Accelerator");
- return 0;
+ return BUS_PROBE_DEFAULT;
/*case PCI_DEVICE_3DFX_BANSHEE:
device_set_desc(dev, "3DFX Voodoo Banshee 2D/3D Graphics Accelerator");
- return 0;
+ return BUS_PROBE_DEFAULT;
case PCI_DEVICE_3DFX_VOODOO3:
device_set_desc(dev, "3DFX Voodoo3 2D/3D Graphics Accelerator");
- return 0;*/
+ return BUS_PROBE_DEFAULT;*/
case PCI_DEVICE_3DFX_VOODOO1:
device_set_desc(dev, "3DFX Voodoo Graphics 3D Accelerator");
- return 0;;
+ return BUS_PROBE_DEFAULT;
};
return ENXIO;
diff --git a/sys/dev/tga/tga_pci.c b/sys/dev/tga/tga_pci.c
index ffa5deb..25afbfd 100644
--- a/sys/dev/tga/tga_pci.c
+++ b/sys/dev/tga/tga_pci.c
@@ -121,7 +121,7 @@ tga_probe(device_t dev)
if((pci_get_vendor(dev) == t->vendor_id) &&
(pci_get_device(dev) == t->device_id)) {
device_set_desc(dev, t->name);
- error = 0;
+ error = BUS_PROBE_DEFAULT;
break;
}
t++;
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index fac2c90..0c03791 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -3693,11 +3693,11 @@ trm_probe(device_t dev)
case PCI_DEVICEID_TRMS1040:
device_set_desc(dev,
"Tekram DC395U/UW/F DC315/U Fast20 Wide SCSI Adapter");
- return (0);
+ return (BUS_PROBE_DEFAULT);
case PCI_DEVICEID_TRMS2080:
device_set_desc(dev,
"Tekram DC395U2D/U2W Fast40 Wide SCSI Adapter");
- return 0;
+ return (BUS_PROBE_DEFAULT);
default:
return (ENXIO);
}
diff --git a/sys/dev/twa/twa_freebsd.c b/sys/dev/twa/twa_freebsd.c
index 7c07a9c..7eff607 100644
--- a/sys/dev/twa/twa_freebsd.c
+++ b/sys/dev/twa/twa_freebsd.c
@@ -196,7 +196,7 @@ twa_probe(device_t dev)
TWA_DRIVER_VERSION_STRING);
first_ctlr = 0;
}
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
return(ENXIO);
}
diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c
index fd0a993..275ee95 100644
--- a/sys/dev/twe/twe_freebsd.c
+++ b/sys/dev/twe/twe_freebsd.c
@@ -163,7 +163,7 @@ twe_probe(device_t dev)
((pci_get_device(dev) == TWE_DEVICE_ID) ||
(pci_get_device(dev) == TWE_DEVICE_ID_ASIC))) {
device_set_desc_copy(dev, TWE_DEVICE_NAME ". Driver version " TWE_DRIVER_VERSION_STRING);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
return(ENXIO);
}
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 4351037..a7be029 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -169,7 +169,7 @@ epic_probe(dev)
if (t != NULL) {
device_set_desc(dev, t->name);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
return (ENXIO);
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index a280532..8e708eb 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -202,7 +202,7 @@ txp_probe(dev)
if ((pci_get_vendor(dev) == t->txp_vid) &&
(pci_get_device(dev) == t->txp_did)) {
device_set_desc(dev, t->txp_name);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
t++;
}
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index 39da78c..338ce63 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -199,11 +199,11 @@ ubsec_probe(device_t dev)
if (pci_get_vendor(dev) == PCI_VENDOR_SUN &&
(pci_get_device(dev) == PCI_PRODUCT_SUN_5821 ||
pci_get_device(dev) == PCI_PRODUCT_SUN_SCA1K))
- return (0);
+ return (BUS_PROBE_DEFAULT);
if (pci_get_vendor(dev) == PCI_VENDOR_BLUESTEEL &&
(pci_get_device(dev) == PCI_PRODUCT_BLUESTEEL_5501 ||
pci_get_device(dev) == PCI_PRODUCT_BLUESTEEL_5601))
- return (0);
+ return (BUS_PROBE_DEFAULT);
if (pci_get_vendor(dev) == PCI_VENDOR_BROADCOM &&
(pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5801 ||
pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5802 ||
@@ -213,7 +213,7 @@ ubsec_probe(device_t dev)
pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5822 ||
pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823
))
- return (0);
+ return (BUS_PROBE_DEFAULT);
return (ENXIO);
}
diff --git a/sys/dev/usb/ehci_pci.c b/sys/dev/usb/ehci_pci.c
index 2ccbeb9..16bdb87 100644
--- a/sys/dev/usb/ehci_pci.c
+++ b/sys/dev/usb/ehci_pci.c
@@ -176,7 +176,7 @@ ehci_pci_probe(device_t self)
if (desc) {
device_set_desc(self, desc);
- return 0;
+ return BUS_PROBE_DEFAULT;
} else {
return ENXIO;
}
diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c
index 3766e68..dcb51de 100644
--- a/sys/dev/usb/ohci_pci.c
+++ b/sys/dev/usb/ohci_pci.c
@@ -202,7 +202,7 @@ ohci_pci_probe(device_t self)
if (desc) {
device_set_desc(self, desc);
- return 0;
+ return BUS_PROBE_DEFAULT;
} else {
return ENXIO;
}
diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c
index 3583eae..c92273c 100644
--- a/sys/dev/usb/uhci_pci.c
+++ b/sys/dev/usb/uhci_pci.c
@@ -255,7 +255,7 @@ uhci_pci_probe(device_t self)
if (desc) {
device_set_desc(self, desc);
- return 0;
+ return BUS_PROBE_DEFAULT;
} else {
return ENXIO;
}
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index 1ec4ed7..dbd5e6a 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -680,7 +680,7 @@ vge_probe(dev)
if ((pci_get_vendor(dev) == t->vge_vid) &&
(pci_get_device(dev) == t->vge_did)) {
device_set_desc(dev, t->vge_name);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
t++;
}
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 220da32..3afe238 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -94,28 +94,26 @@ vx_pci_probe(device_t dev)
if (device_id == 0x590010b7ul) {
device_set_desc(dev, "3COM 3C590 Etherlink III PCI");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
if (device_id == 0x595010b7ul || device_id == 0x595110b7ul ||
device_id == 0x595210b7ul) {
device_set_desc(dev, "3COM 3C595 Etherlink III PCI");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
/*
* The (Fast) Etherlink XL adapters are now supported by
* the xl driver, which uses bus master DMA and is much
* faster. (And which also supports the 3c905B.
*/
-#ifdef VORTEX_ETHERLINK_XL
if (device_id == 0x900010b7ul || device_id == 0x900110b7ul) {
device_set_desc(dev, "3COM 3C900 Etherlink XL PCI");
- return (0);
+ return (BUS_PROBE_LOW_PRIORITY);
}
if (device_id == 0x905010b7ul || device_id == 0x905110b7ul) {
device_set_desc(dev, "3COM 3C905 Etherlink XL PCI");
- return (0);
+ return (BUS_PROBE_LOW_PRIORITY);
}
-#endif
return (ENXIO);
}
diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c
index 932a0c3..a8e955f 100644
--- a/sys/dev/wi/if_wi_pci.c
+++ b/sys/dev/wi/if_wi_pci.c
@@ -128,7 +128,7 @@ wi_pci_probe(dev)
(pci_get_device(dev) == pci_ids[i].device)) {
sc->wi_bus_type = pci_ids[i].bus_type;
device_set_desc(dev, pci_ids[i].desc);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
}
return(ENXIO);
OpenPOWER on IntegriCloud