From e37467a3e30a093d964420da088b37a1da5a7c12 Mon Sep 17 00:00:00 2001
From: mav <mav@FreeBSD.org>
Date: Wed, 24 Jun 2009 19:49:18 +0000
Subject: [PATCH] MFp4: Reduce default PCI ATA drivers priorities from absolute
 to default, to allow them been overriden. It was so before modularization.

---
 sys/dev/ata/chipsets/ata-acard.c        | 2 +-
 sys/dev/ata/chipsets/ata-acerlabs.c     | 2 +-
 sys/dev/ata/chipsets/ata-adaptec.c      | 2 +-
 sys/dev/ata/chipsets/ata-amd.c          | 2 +-
 sys/dev/ata/chipsets/ata-ati.c          | 2 +-
 sys/dev/ata/chipsets/ata-cenatek.c      | 2 +-
 sys/dev/ata/chipsets/ata-cypress.c      | 2 +-
 sys/dev/ata/chipsets/ata-cyrix.c        | 2 +-
 sys/dev/ata/chipsets/ata-highpoint.c    | 2 +-
 sys/dev/ata/chipsets/ata-intel.c        | 2 +-
 sys/dev/ata/chipsets/ata-ite.c          | 2 +-
 sys/dev/ata/chipsets/ata-jmicron.c      | 2 +-
 sys/dev/ata/chipsets/ata-marvell.c      | 2 +-
 sys/dev/ata/chipsets/ata-micron.c       | 2 +-
 sys/dev/ata/chipsets/ata-national.c     | 2 +-
 sys/dev/ata/chipsets/ata-netcell.c      | 2 +-
 sys/dev/ata/chipsets/ata-nvidia.c       | 2 +-
 sys/dev/ata/chipsets/ata-promise.c      | 2 +-
 sys/dev/ata/chipsets/ata-serverworks.c  | 2 +-
 sys/dev/ata/chipsets/ata-siliconimage.c | 2 +-
 sys/dev/ata/chipsets/ata-sis.c          | 2 +-
 sys/dev/ata/chipsets/ata-via.c          | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/sys/dev/ata/chipsets/ata-acard.c b/sys/dev/ata/chipsets/ata-acard.c
index 552c00b6f7c1..c52c2cbc0883 100644
--- a/sys/dev/ata/chipsets/ata-acard.c
+++ b/sys/dev/ata/chipsets/ata-acard.c
@@ -93,7 +93,7 @@ ata_acard_probe(device_t dev)
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_acard_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-acerlabs.c b/sys/dev/ata/chipsets/ata-acerlabs.c
index a888989f2c5c..cf503c591b2d 100644
--- a/sys/dev/ata/chipsets/ata-acerlabs.c
+++ b/sys/dev/ata/chipsets/ata-acerlabs.c
@@ -94,7 +94,7 @@ ata_ali_probe(device_t dev)
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_ali_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-adaptec.c b/sys/dev/ata/chipsets/ata-adaptec.c
index 11bb8bec01e7..6b92ee4a67a5 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 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 ATA_DECLARE_DRIVER(ata_adaptec);
diff --git a/sys/dev/ata/chipsets/ata-amd.c b/sys/dev/ata/chipsets/ata-amd.c
index a3764443900b..9c14e99cba4c 100644
--- a/sys/dev/ata/chipsets/ata-amd.c
+++ b/sys/dev/ata/chipsets/ata-amd.c
@@ -83,7 +83,7 @@ ata_amd_probe(device_t dev)
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_amd_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-ati.c b/sys/dev/ata/chipsets/ata-ati.c
index 7a5d99251410..1dffa918fde2 100644
--- a/sys/dev/ata/chipsets/ata-ati.c
+++ b/sys/dev/ata/chipsets/ata-ati.c
@@ -136,7 +136,7 @@ ata_ati_probe(device_t dev)
 	ctlr->chipinit = ata_ati_ahci_chipinit;
 	break;
     }
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-cenatek.c b/sys/dev/ata/chipsets/ata-cenatek.c
index 2fd4f083444d..8f6474cc57ab 100644
--- a/sys/dev/ata/chipsets/ata-cenatek.c
+++ b/sys/dev/ata/chipsets/ata-cenatek.c
@@ -69,7 +69,7 @@ ata_cenatek_probe(device_t dev)
 
     ctlr->chipinit = ata_cenatek_chipinit;
     device_set_desc(dev, "Cenatek Rocket Drive controller");
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-cypress.c b/sys/dev/ata/chipsets/ata-cypress.c
index a9e0b95d1f29..ffa9782fa8b6 100644
--- a/sys/dev/ata/chipsets/ata-cypress.c
+++ b/sys/dev/ata/chipsets/ata-cypress.c
@@ -76,7 +76,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 0;
+	return (BUS_PROBE_DEFAULT);
     }
     return ENXIO;
 }
diff --git a/sys/dev/ata/chipsets/ata-cyrix.c b/sys/dev/ata/chipsets/ata-cyrix.c
index ca682a475d03..ddfa56245b7b 100644
--- a/sys/dev/ata/chipsets/ata-cyrix.c
+++ b/sys/dev/ata/chipsets/ata-cyrix.c
@@ -67,7 +67,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 0;
+	return (BUS_PROBE_DEFAULT);
     }
     return ENXIO;
 }
diff --git a/sys/dev/ata/chipsets/ata-highpoint.c b/sys/dev/ata/chipsets/ata-highpoint.c
index 7ee7e929430f..101b054f483d 100644
--- a/sys/dev/ata/chipsets/ata-highpoint.c
+++ b/sys/dev/ata/chipsets/ata-highpoint.c
@@ -104,7 +104,7 @@ ata_highpoint_probe(device_t dev)
     device_set_desc_copy(dev, buffer);
     ctlr->chip = idx;
     ctlr->chipinit = ata_highpoint_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c
index b2a9c81ca50c..c8ed0c05c0ba 100644
--- a/sys/dev/ata/chipsets/ata-intel.c
+++ b/sys/dev/ata/chipsets/ata-intel.c
@@ -146,7 +146,7 @@ ata_intel_probe(device_t dev)
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_intel_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-ite.c b/sys/dev/ata/chipsets/ata-ite.c
index e3175edde4ba..61879172aeb3 100644
--- a/sys/dev/ata/chipsets/ata-ite.c
+++ b/sys/dev/ata/chipsets/ata-ite.c
@@ -78,7 +78,7 @@ ata_ite_probe(device_t dev)
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_ite_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-jmicron.c b/sys/dev/ata/chipsets/ata-jmicron.c
index b1e7aef4f67c..91108af80935 100644
--- a/sys/dev/ata/chipsets/ata-jmicron.c
+++ b/sys/dev/ata/chipsets/ata-jmicron.c
@@ -94,7 +94,7 @@ ata_jmicron_probe(device_t dev)
     device_set_desc_copy(dev, buffer);
     ctlr->chip = idx;
     ctlr->chipinit = ata_jmicron_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-marvell.c b/sys/dev/ata/chipsets/ata-marvell.c
index 361bc5b2dcbc..a1dff9bd97aa 100644
--- a/sys/dev/ata/chipsets/ata-marvell.c
+++ b/sys/dev/ata/chipsets/ata-marvell.c
@@ -125,7 +125,7 @@ ata_marvell_probe(device_t dev)
 	ctlr->chipinit = ata_marvell_pata_chipinit;
 	break;
     }
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-micron.c b/sys/dev/ata/chipsets/ata-micron.c
index 1351f09140eb..ce7587430406 100644
--- a/sys/dev/ata/chipsets/ata-micron.c
+++ b/sys/dev/ata/chipsets/ata-micron.c
@@ -69,7 +69,7 @@ ata_micron_probe(device_t dev)
 	device_set_desc(dev,
 	    "RZ 100? ATA controller !WARNING! data loss/corruption risk");
 	ctlr->chipinit = ata_micron_chipinit;
-	return 0;
+	return (BUS_PROBE_DEFAULT);
     }
     else
 	return ENXIO;
diff --git a/sys/dev/ata/chipsets/ata-national.c b/sys/dev/ata/chipsets/ata-national.c
index 1af71c818609..840360ad2b66 100644
--- a/sys/dev/ata/chipsets/ata-national.c
+++ b/sys/dev/ata/chipsets/ata-national.c
@@ -68,7 +68,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 0;
+	return (BUS_PROBE_DEFAULT);
     }
     return ENXIO;
 }
diff --git a/sys/dev/ata/chipsets/ata-netcell.c b/sys/dev/ata/chipsets/ata-netcell.c
index 8c19af8da113..c07df0ea2a57 100644
--- a/sys/dev/ata/chipsets/ata-netcell.c
+++ b/sys/dev/ata/chipsets/ata-netcell.c
@@ -68,7 +68,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 0;
+	return (BUS_PROBE_DEFAULT);
     }
     return ENXIO;
 }
diff --git a/sys/dev/ata/chipsets/ata-nvidia.c b/sys/dev/ata/chipsets/ata-nvidia.c
index e3602c08a407..29f6ef83dad8 100644
--- a/sys/dev/ata/chipsets/ata-nvidia.c
+++ b/sys/dev/ata/chipsets/ata-nvidia.c
@@ -138,7 +138,7 @@ ata_nvidia_probe(device_t dev)
 	ctlr->chipinit = ata_ahci_chipinit;
     else
 	ctlr->chipinit = ata_nvidia_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-promise.c b/sys/dev/ata/chipsets/ata-promise.c
index f0632071b2c1..37863ce7ff25 100644
--- a/sys/dev/ata/chipsets/ata-promise.c
+++ b/sys/dev/ata/chipsets/ata-promise.c
@@ -210,7 +210,7 @@ ata_promise_probe(device_t dev)
     device_set_desc_copy(dev, buffer);
     ctlr->chip = idx;
     ctlr->chipinit = ata_promise_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-serverworks.c b/sys/dev/ata/chipsets/ata-serverworks.c
index c591d3d0ae9a..eca72d477808 100644
--- a/sys/dev/ata/chipsets/ata-serverworks.c
+++ b/sys/dev/ata/chipsets/ata-serverworks.c
@@ -98,7 +98,7 @@ ata_serverworks_probe(device_t dev)
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_serverworks_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 #ifdef __powerpc__
diff --git a/sys/dev/ata/chipsets/ata-siliconimage.c b/sys/dev/ata/chipsets/ata-siliconimage.c
index f4f086bfbcb2..232592e071a2 100644
--- a/sys/dev/ata/chipsets/ata-siliconimage.c
+++ b/sys/dev/ata/chipsets/ata-siliconimage.c
@@ -115,7 +115,7 @@ ata_sii_probe(device_t dev)
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_sii_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 int
diff --git a/sys/dev/ata/chipsets/ata-sis.c b/sys/dev/ata/chipsets/ata-sis.c
index 8e02ee904453..5c74e56edf20 100644
--- a/sys/dev/ata/chipsets/ata-sis.c
+++ b/sys/dev/ata/chipsets/ata-sis.c
@@ -155,7 +155,7 @@ ata_sis_probe(device_t dev)
     device_set_desc_copy(dev, buffer);
     ctlr->chip = idx;
     ctlr->chipinit = ata_sis_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int
diff --git a/sys/dev/ata/chipsets/ata-via.c b/sys/dev/ata/chipsets/ata-via.c
index 525ca2fb571d..daed0db13af2 100644
--- a/sys/dev/ata/chipsets/ata-via.c
+++ b/sys/dev/ata/chipsets/ata-via.c
@@ -120,7 +120,7 @@ ata_via_probe(device_t dev)
 
     ata_set_desc(dev);
     ctlr->chipinit = ata_via_chipinit;
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 static int