summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/ichsmb/ichsmb.c2
-rw-r--r--sys/dev/ichsmb/ichsmb_pci.c2
-rw-r--r--sys/dev/ida/ida_pci.c2
-rw-r--r--sys/dev/idt/idt_pci.c2
-rw-r--r--sys/dev/iir/iir_pci.c4
-rw-r--r--sys/dev/ips/ips_pci.c6
-rw-r--r--sys/dev/isp/isp_pci.c2
-rw-r--r--sys/dev/ixgb/if_ixgb.c2
-rw-r--r--sys/dev/lge/if_lge.c2
-rw-r--r--sys/dev/lnc/if_lnc_pci.c6
10 files changed, 14 insertions, 16 deletions
diff --git a/sys/dev/ichsmb/ichsmb.c b/sys/dev/ichsmb/ichsmb.c
index 8896745..aed9396 100644
--- a/sys/dev/ichsmb/ichsmb.c
+++ b/sys/dev/ichsmb/ichsmb.c
@@ -104,7 +104,7 @@ ichsmb_probe(device_t dev)
device_get_nameunit(dev), DRIVER_SMBUS);
return (ENXIO);
}
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
/*
diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c
index 4432a6d..b0c9fba 100644
--- a/sys/dev/ichsmb/ichsmb_pci.c
+++ b/sys/dev/ichsmb/ichsmb_pci.c
@@ -146,7 +146,7 @@ ichsmb_pci_probe(device_t dev)
&& pci_get_subclass(dev) == PCIS_SERIALBUS_SMBUS
&& pci_get_progif(dev) == PCIS_SERIALBUS_SMBUS_PROGIF) {
device_set_desc(dev, "SMBus controller");
- return (-2); /* XXX */
+ return (BUS_PROBE_DEFAULT); /* XXX */
}
return (ENXIO);
}
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index 1053317..4472e01 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -229,7 +229,7 @@ ida_pci_probe(device_t dev)
if (board != NULL) {
device_set_desc(dev, board->desc);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
return (ENXIO);
}
diff --git a/sys/dev/idt/idt_pci.c b/sys/dev/idt/idt_pci.c
index 035b68f..26b1e5a 100644
--- a/sys/dev/idt/idt_pci.c
+++ b/sys/dev/idt/idt_pci.c
@@ -108,7 +108,7 @@ idt_probe(device_t dev)
if ((pci_get_vendor(dev) == t->pci_vid) &&
(pci_get_device(dev) == t->pci_did)) {
device_set_desc(dev, t->pci_name);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
t++;
}
diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c
index d0ff7bb..2edfc91 100644
--- a/sys/dev/iir/iir_pci.c
+++ b/sys/dev/iir/iir_pci.c
@@ -168,14 +168,14 @@ iir_pci_probe(device_t dev)
if (pci_get_vendor(dev) == INTEL_VENDOR_ID &&
pci_get_device(dev) == INTEL_DEVICE_ID_IIR) {
device_set_desc(dev, "Intel Integrated RAID Controller");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
if (pci_get_vendor(dev) == GDT_VENDOR_ID &&
((pci_get_device(dev) >= GDT_DEVICE_ID_MIN &&
pci_get_device(dev) <= GDT_DEVICE_ID_MAX) ||
pci_get_device(dev) == GDT_DEVICE_ID_NEWRX)) {
device_set_desc(dev, "ICP Disk Array Controller");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
return (ENXIO);
}
diff --git a/sys/dev/ips/ips_pci.c b/sys/dev/ips/ips_pci.c
index a8de5e4..569c60f 100644
--- a/sys/dev/ips/ips_pci.c
+++ b/sys/dev/ips/ips_pci.c
@@ -40,15 +40,15 @@ static int ips_pci_probe(device_t dev)
if ((pci_get_vendor(dev) == IPS_VENDOR_ID) &&
(pci_get_device(dev) == IPS_MORPHEUS_DEVICE_ID)) {
device_set_desc(dev, "IBM ServeRAID Adapter");
- return 0;
+ return (BUS_PROBE_DEFAULT);
} else if ((pci_get_vendor(dev) == IPS_VENDOR_ID) &&
(pci_get_device(dev) == IPS_COPPERHEAD_DEVICE_ID)) {
device_set_desc(dev, "IBM ServeRAID Adapter");
- return (0);
+ return (BUS_PROBE_DEFAULT);
} else if ((pci_get_vendor(dev) == IPS_VENDOR_ID_ADAPTEC) &&
(pci_get_device(dev) == IPS_MARCO_DEVICE_ID)) {
device_set_desc(dev, "Adaptec ServeRAID Adapter");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
return(ENXIO);
}
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index be92b96..1e7213c 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -354,7 +354,7 @@ isp_pci_probe(device_t dev)
* XXXX: Here is where we might load the f/w module
* XXXX: (or increase a reference count to it).
*/
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c
index 6e58eea..4256ecb 100644
--- a/sys/dev/ixgb/if_ixgb.c
+++ b/sys/dev/ixgb/if_ixgb.c
@@ -212,7 +212,7 @@ ixgb_probe(device_t dev)
ixgb_strings[ent->index],
ixgb_driver_version);
device_set_desc_copy(dev, adapter_name);
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
ent++;
}
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 6a8ab86..9c01ca4 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -446,7 +446,7 @@ lge_probe(dev)
if ((pci_get_vendor(dev) == t->lge_vid) &&
(pci_get_device(dev) == t->lge_did)) {
device_set_desc(dev, t->lge_name);
- return(0);
+ return(BUS_PROBE_DEFAULT);
}
t++;
}
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index 688385a..9de7c9e 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -57,8 +57,6 @@ __FBSDID("$FreeBSD$");
#define PCI_DEVICE_ID_PCNet_PCI 0x2000
#define PCI_DEVICE_ID_PCHome_PCI 0x2001
-#define LNC_PROBE_PRIORITY -1
-
static int
lnc_pci_probe(device_t dev)
{
@@ -68,11 +66,11 @@ lnc_pci_probe(device_t dev)
switch(pci_get_device(dev)) {
case PCI_DEVICE_ID_PCNet_PCI:
device_set_desc(dev, "PCNet/PCI Ethernet adapter");
- return(LNC_PROBE_PRIORITY);
+ return(BUS_PROBE_DEFAULT);
break;
case PCI_DEVICE_ID_PCHome_PCI:
device_set_desc(dev, "PCHome/PCI Ethernet adapter");
- return(LNC_PROBE_PRIORITY);
+ return(BUS_PROBE_DEFAULT);
break;
default:
return (ENXIO);
OpenPOWER on IntegriCloud