aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ahci/ahci.c2
-rw-r--r--sys/dev/ahci/ahci_pci.c8
-rw-r--r--sys/dev/ahci/ahciem.c2
-rw-r--r--sys/dev/ata/ata-all.c2
-rw-r--r--sys/dev/ata/chipsets/ata-acard.c2
-rw-r--r--sys/dev/ata/chipsets/ata-acerlabs.c2
-rw-r--r--sys/dev/ata/chipsets/ata-adaptec.c2
-rw-r--r--sys/dev/ata/chipsets/ata-amd.c2
-rw-r--r--sys/dev/ata/chipsets/ata-ati.c2
-rw-r--r--sys/dev/ata/chipsets/ata-cenatek.c2
-rw-r--r--sys/dev/ata/chipsets/ata-cypress.c2
-rw-r--r--sys/dev/ata/chipsets/ata-cyrix.c2
-rw-r--r--sys/dev/ata/chipsets/ata-fsl.c2
-rw-r--r--sys/dev/ata/chipsets/ata-highpoint.c2
-rw-r--r--sys/dev/ata/chipsets/ata-intel.c2
-rw-r--r--sys/dev/ata/chipsets/ata-ite.c2
-rw-r--r--sys/dev/ata/chipsets/ata-jmicron.c2
-rw-r--r--sys/dev/ata/chipsets/ata-marvell.c2
-rw-r--r--sys/dev/ata/chipsets/ata-micron.c2
-rw-r--r--sys/dev/ata/chipsets/ata-national.c2
-rw-r--r--sys/dev/ata/chipsets/ata-netcell.c2
-rw-r--r--sys/dev/ata/chipsets/ata-nvidia.c2
-rw-r--r--sys/dev/ata/chipsets/ata-promise.c2
-rw-r--r--sys/dev/ata/chipsets/ata-serverworks.c2
-rw-r--r--sys/dev/ata/chipsets/ata-siliconimage.c2
-rw-r--r--sys/dev/ata/chipsets/ata-sis.c2
-rw-r--r--sys/dev/ata/chipsets/ata-via.c2
-rw-r--r--sys/dev/mvs/mvs.c2
-rw-r--r--sys/dev/mvs/mvs_pci.c2
-rw-r--r--sys/dev/mvs/mvs_soc.c2
-rw-r--r--sys/dev/siis/siis.c4
31 files changed, 35 insertions, 35 deletions
diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c
index b0fad5ad6fa7..795de22f458c 100644
--- a/sys/dev/ahci/ahci.c
+++ b/sys/dev/ahci/ahci.c
@@ -638,7 +638,7 @@ ahci_ch_probe(device_t dev)
{
device_set_desc_copy(dev, "AHCI channel");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c
index b74bfa0a2b99..54cbedac5516 100644
--- a/sys/dev/ahci/ahci_pci.c
+++ b/sys/dev/ahci/ahci_pci.c
@@ -340,13 +340,13 @@ ahci_probe(device_t dev)
snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
ahci_ids[i].name);
device_set_desc_copy(dev, buf);
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
}
if (!valid)
return (ENXIO);
device_set_desc_copy(dev, "AHCI SATA controller");
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
static int
@@ -366,11 +366,11 @@ ahci_ata_probe(device_t dev)
snprintf(buf, sizeof(buf), "%s AHCI SATA controller",
ahci_ids[i].name);
device_set_desc_copy(dev, buf);
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
}
device_set_desc_copy(dev, "AHCI SATA controller");
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
static int
diff --git a/sys/dev/ahci/ahciem.c b/sys/dev/ahci/ahciem.c
index 049b7c8866f3..5f222e9867fd 100644
--- a/sys/dev/ahci/ahciem.c
+++ b/sys/dev/ahci/ahciem.c
@@ -65,7 +65,7 @@ ahci_em_probe(device_t dev)
{
device_set_desc_copy(dev, "AHCI enclosure management bridge");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 579a2c5e6f7a..19d6eb2cdb53 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -91,7 +91,7 @@ FEATURE(ata_cam, "ATA devices are accessed through the cam(4) driver");
int
ata_probe(device_t dev)
{
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
int
diff --git a/sys/dev/ata/chipsets/ata-acard.c b/sys/dev/ata/chipsets/ata-acard.c
index e8b9d41497f5..41269455e1f5 100644
--- a/sys/dev/ata/chipsets/ata-acard.c
+++ b/sys/dev/ata/chipsets/ata-acard.c
@@ -83,7 +83,7 @@ ata_acard_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_acard_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-acerlabs.c b/sys/dev/ata/chipsets/ata-acerlabs.c
index cddae264bc98..cb30e633ded3 100644
--- a/sys/dev/ata/chipsets/ata-acerlabs.c
+++ b/sys/dev/ata/chipsets/ata-acerlabs.c
@@ -96,7 +96,7 @@ ata_ali_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_ali_chipinit;
ctlr->chipdeinit = ata_ali_chipdeinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-adaptec.c b/sys/dev/ata/chipsets/ata-adaptec.c
index 0481c74e39a9..8654af3efaec 100644
--- a/sys/dev/ata/chipsets/ata-adaptec.c
+++ b/sys/dev/ata/chipsets/ata-adaptec.c
@@ -75,7 +75,7 @@ ata_adaptec_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_marvell_edma_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
ATA_DECLARE_DRIVER(ata_adaptec);
diff --git a/sys/dev/ata/chipsets/ata-amd.c b/sys/dev/ata/chipsets/ata-amd.c
index cd2e70131d92..a8f913d41914 100644
--- a/sys/dev/ata/chipsets/ata-amd.c
+++ b/sys/dev/ata/chipsets/ata-amd.c
@@ -82,7 +82,7 @@ ata_amd_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_amd_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-ati.c b/sys/dev/ata/chipsets/ata-ati.c
index 475bee56f6b9..8aef8e87f754 100644
--- a/sys/dev/ata/chipsets/ata-ati.c
+++ b/sys/dev/ata/chipsets/ata-ati.c
@@ -123,7 +123,7 @@ ata_ati_probe(device_t dev)
ctlr->chipinit = ata_ati_chipinit;
break;
}
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-cenatek.c b/sys/dev/ata/chipsets/ata-cenatek.c
index e46c037482d4..151f3169a4c5 100644
--- a/sys/dev/ata/chipsets/ata-cenatek.c
+++ b/sys/dev/ata/chipsets/ata-cenatek.c
@@ -63,7 +63,7 @@ ata_cenatek_probe(device_t dev)
ctlr->chipinit = ata_generic_chipinit;
device_set_desc(dev, "Cenatek Rocket Drive controller");
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
ATA_DECLARE_DRIVER(ata_cenatek);
diff --git a/sys/dev/ata/chipsets/ata-cypress.c b/sys/dev/ata/chipsets/ata-cypress.c
index e047e9d04eb6..e4a1419e1ac0 100644
--- a/sys/dev/ata/chipsets/ata-cypress.c
+++ b/sys/dev/ata/chipsets/ata-cypress.c
@@ -75,7 +75,7 @@ ata_cypress_probe(device_t dev)
pci_get_subclass(dev) == PCIS_STORAGE_IDE) {
device_set_desc(dev, "Cypress 82C693 ATA controller");
ctlr->chipinit = ata_cypress_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
return ENXIO;
}
diff --git a/sys/dev/ata/chipsets/ata-cyrix.c b/sys/dev/ata/chipsets/ata-cyrix.c
index ede61c610141..c8582c3b7e79 100644
--- a/sys/dev/ata/chipsets/ata-cyrix.c
+++ b/sys/dev/ata/chipsets/ata-cyrix.c
@@ -66,7 +66,7 @@ ata_cyrix_probe(device_t dev)
if (pci_get_devid(dev) == ATA_CYRIX_5530) {
device_set_desc(dev, "Cyrix 5530 ATA33 controller");
ctlr->chipinit = ata_cyrix_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
return ENXIO;
}
diff --git a/sys/dev/ata/chipsets/ata-fsl.c b/sys/dev/ata/chipsets/ata-fsl.c
index aebf9a2ebfd3..c78e984282bd 100644
--- a/sys/dev/ata/chipsets/ata-fsl.c
+++ b/sys/dev/ata/chipsets/ata-fsl.c
@@ -79,7 +79,7 @@ imx_ata_probe(device_t dev)
ctrl = device_get_softc(dev);
device_set_desc(dev, "Freescale Integrated PATA Controller");
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static void
diff --git a/sys/dev/ata/chipsets/ata-highpoint.c b/sys/dev/ata/chipsets/ata-highpoint.c
index 094e5350911e..4aee3c6d92f7 100644
--- a/sys/dev/ata/chipsets/ata-highpoint.c
+++ b/sys/dev/ata/chipsets/ata-highpoint.c
@@ -103,7 +103,7 @@ ata_highpoint_probe(device_t dev)
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
ctlr->chipinit = ata_highpoint_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c
index c135dd75b979..eaf582349575 100644
--- a/sys/dev/ata/chipsets/ata-intel.c
+++ b/sys/dev/ata/chipsets/ata-intel.c
@@ -264,7 +264,7 @@ ata_intel_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_intel_chipinit;
ctlr->chipdeinit = ata_intel_chipdeinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-ite.c b/sys/dev/ata/chipsets/ata-ite.c
index 1ebb773ef6d5..f204e7a44bb3 100644
--- a/sys/dev/ata/chipsets/ata-ite.c
+++ b/sys/dev/ata/chipsets/ata-ite.c
@@ -77,7 +77,7 @@ ata_ite_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_ite_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-jmicron.c b/sys/dev/ata/chipsets/ata-jmicron.c
index 44d764cd1d66..d1279a670769 100644
--- a/sys/dev/ata/chipsets/ata-jmicron.c
+++ b/sys/dev/ata/chipsets/ata-jmicron.c
@@ -86,7 +86,7 @@ ata_jmicron_probe(device_t dev)
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
ctlr->chipinit = ata_jmicron_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-marvell.c b/sys/dev/ata/chipsets/ata-marvell.c
index 65d55e4e6f1a..d81634fd70a4 100644
--- a/sys/dev/ata/chipsets/ata-marvell.c
+++ b/sys/dev/ata/chipsets/ata-marvell.c
@@ -139,7 +139,7 @@ ata_marvell_probe(device_t dev)
ctlr->chipinit = ata_marvell_dummy_chipinit;
break;
}
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-micron.c b/sys/dev/ata/chipsets/ata-micron.c
index 774eadfbda75..67b544f84a08 100644
--- a/sys/dev/ata/chipsets/ata-micron.c
+++ b/sys/dev/ata/chipsets/ata-micron.c
@@ -63,7 +63,7 @@ ata_micron_probe(device_t dev)
device_set_desc(dev,
"RZ 100? ATA controller !WARNING! data loss/corruption risk");
ctlr->chipinit = ata_generic_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
return (ENXIO);
}
diff --git a/sys/dev/ata/chipsets/ata-national.c b/sys/dev/ata/chipsets/ata-national.c
index b3fc440b22a0..8e29b10604dc 100644
--- a/sys/dev/ata/chipsets/ata-national.c
+++ b/sys/dev/ata/chipsets/ata-national.c
@@ -67,7 +67,7 @@ ata_national_probe(device_t dev)
if (pci_get_devid(dev) == ATA_SC1100) {
device_set_desc(dev, "National Geode SC1100 ATA33 controller");
ctlr->chipinit = ata_national_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
return ENXIO;
}
diff --git a/sys/dev/ata/chipsets/ata-netcell.c b/sys/dev/ata/chipsets/ata-netcell.c
index a954a79462f8..82e719d69fa1 100644
--- a/sys/dev/ata/chipsets/ata-netcell.c
+++ b/sys/dev/ata/chipsets/ata-netcell.c
@@ -66,7 +66,7 @@ ata_netcell_probe(device_t dev)
if (pci_get_devid(dev) == ATA_NETCELL_SR) {
device_set_desc(dev, "Netcell SyncRAID SR3000/5000 RAID Controller");
ctlr->chipinit = ata_netcell_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
return ENXIO;
}
diff --git a/sys/dev/ata/chipsets/ata-nvidia.c b/sys/dev/ata/chipsets/ata-nvidia.c
index 96de40671551..5a7a381bb411 100644
--- a/sys/dev/ata/chipsets/ata-nvidia.c
+++ b/sys/dev/ata/chipsets/ata-nvidia.c
@@ -187,7 +187,7 @@ ata_nvidia_probe(device_t dev)
ctlr->chipinit = ata_ahci_chipinit;
else
ctlr->chipinit = ata_nvidia_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-promise.c b/sys/dev/ata/chipsets/ata-promise.c
index fbcd16c6cb1f..70adec3e0b0f 100644
--- a/sys/dev/ata/chipsets/ata-promise.c
+++ b/sys/dev/ata/chipsets/ata-promise.c
@@ -209,7 +209,7 @@ ata_promise_probe(device_t dev)
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
ctlr->chipinit = ata_promise_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-serverworks.c b/sys/dev/ata/chipsets/ata-serverworks.c
index 62ed677c65b6..720727f17250 100644
--- a/sys/dev/ata/chipsets/ata-serverworks.c
+++ b/sys/dev/ata/chipsets/ata-serverworks.c
@@ -96,7 +96,7 @@ ata_serverworks_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_serverworks_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-siliconimage.c b/sys/dev/ata/chipsets/ata-siliconimage.c
index 38d41630617e..bf431a12795d 100644
--- a/sys/dev/ata/chipsets/ata-siliconimage.c
+++ b/sys/dev/ata/chipsets/ata-siliconimage.c
@@ -113,7 +113,7 @@ ata_sii_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_sii_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
int
diff --git a/sys/dev/ata/chipsets/ata-sis.c b/sys/dev/ata/chipsets/ata-sis.c
index a4df5070a162..1acc37c3ae62 100644
--- a/sys/dev/ata/chipsets/ata-sis.c
+++ b/sys/dev/ata/chipsets/ata-sis.c
@@ -154,7 +154,7 @@ ata_sis_probe(device_t dev)
device_set_desc_copy(dev, buffer);
ctlr->chip = idx;
ctlr->chipinit = ata_sis_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/ata/chipsets/ata-via.c b/sys/dev/ata/chipsets/ata-via.c
index a6aac6bb63ec..f56d707f3250 100644
--- a/sys/dev/ata/chipsets/ata-via.c
+++ b/sys/dev/ata/chipsets/ata-via.c
@@ -141,7 +141,7 @@ ata_via_probe(device_t dev)
ata_set_desc(dev);
ctlr->chipinit = ata_via_chipinit;
- return (BUS_PROBE_DEFAULT);
+ return (BUS_PROBE_LOW_PRIORITY);
}
static int
diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c
index 8feba1f71830..b89db41c13b1 100644
--- a/sys/dev/mvs/mvs.c
+++ b/sys/dev/mvs/mvs.c
@@ -107,7 +107,7 @@ mvs_ch_probe(device_t dev)
{
device_set_desc_copy(dev, "Marvell SATA channel");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int
diff --git a/sys/dev/mvs/mvs_pci.c b/sys/dev/mvs/mvs_pci.c
index bdfccfbb871b..11c1dd3cfa7b 100644
--- a/sys/dev/mvs/mvs_pci.c
+++ b/sys/dev/mvs/mvs_pci.c
@@ -88,7 +88,7 @@ mvs_probe(device_t dev)
snprintf(buf, sizeof(buf), "%s SATA controller",
mvs_ids[i].name);
device_set_desc_copy(dev, buf);
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
}
return (ENXIO);
diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c
index c68b324e04b2..8ed7df4fcdd7 100644
--- a/sys/dev/mvs/mvs_soc.c
+++ b/sys/dev/mvs/mvs_soc.c
@@ -91,7 +91,7 @@ mvs_probe(device_t dev)
snprintf(buf, sizeof(buf), "%s SATA controller",
mvs_ids[i].name);
device_set_desc_copy(dev, buf);
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
}
return (ENXIO);
diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c
index 42057c32f180..301b9e9d8377 100644
--- a/sys/dev/siis/siis.c
+++ b/sys/dev/siis/siis.c
@@ -129,7 +129,7 @@ siis_probe(device_t dev)
snprintf(buf, sizeof(buf), "%s SATA controller",
siis_ids[i].name);
device_set_desc_copy(dev, buf);
- return (BUS_PROBE_VENDOR);
+ return (BUS_PROBE_DEFAULT);
}
}
return (ENXIO);
@@ -451,7 +451,7 @@ siis_ch_probe(device_t dev)
{
device_set_desc_copy(dev, "SIIS channel");
- return (0);
+ return (BUS_PROBE_DEFAULT);
}
static int