Author: mav Date: Wed Jun 24 19:49:18 2009 New Revision: 194893 URL: http://svn.freebsd.org/changeset/base/194893
Log: MFp4: Reduce default PCI ATA drivers priorities from absolute to default, to allow them been overriden. It was so before modularization. Modified: head/sys/dev/ata/chipsets/ata-acard.c head/sys/dev/ata/chipsets/ata-acerlabs.c head/sys/dev/ata/chipsets/ata-adaptec.c head/sys/dev/ata/chipsets/ata-amd.c head/sys/dev/ata/chipsets/ata-ati.c head/sys/dev/ata/chipsets/ata-cenatek.c head/sys/dev/ata/chipsets/ata-cypress.c head/sys/dev/ata/chipsets/ata-cyrix.c head/sys/dev/ata/chipsets/ata-highpoint.c head/sys/dev/ata/chipsets/ata-intel.c head/sys/dev/ata/chipsets/ata-ite.c head/sys/dev/ata/chipsets/ata-jmicron.c head/sys/dev/ata/chipsets/ata-marvell.c head/sys/dev/ata/chipsets/ata-micron.c head/sys/dev/ata/chipsets/ata-national.c head/sys/dev/ata/chipsets/ata-netcell.c head/sys/dev/ata/chipsets/ata-nvidia.c head/sys/dev/ata/chipsets/ata-promise.c head/sys/dev/ata/chipsets/ata-serverworks.c head/sys/dev/ata/chipsets/ata-siliconimage.c head/sys/dev/ata/chipsets/ata-sis.c head/sys/dev/ata/chipsets/ata-via.c Modified: head/sys/dev/ata/chipsets/ata-acard.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-acard.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-acard.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-acerlabs.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-acerlabs.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-acerlabs.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-adaptec.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-adaptec.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-adaptec.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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); Modified: head/sys/dev/ata/chipsets/ata-amd.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-amd.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-amd.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-ati.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-ati.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-ati.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-cenatek.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-cenatek.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-cenatek.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-cypress.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-cypress.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-cypress.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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; } Modified: head/sys/dev/ata/chipsets/ata-cyrix.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-cyrix.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-cyrix.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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; } Modified: head/sys/dev/ata/chipsets/ata-highpoint.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-highpoint.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-highpoint.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-intel.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-intel.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-intel.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-ite.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-ite.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-ite.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-jmicron.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-jmicron.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-jmicron.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-marvell.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-marvell.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-marvell.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-micron.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-micron.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-micron.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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; Modified: head/sys/dev/ata/chipsets/ata-national.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-national.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-national.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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; } Modified: head/sys/dev/ata/chipsets/ata-netcell.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-netcell.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-netcell.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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; } Modified: head/sys/dev/ata/chipsets/ata-nvidia.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-nvidia.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-nvidia.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-promise.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-promise.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-promise.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-serverworks.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-serverworks.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-serverworks.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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__ Modified: head/sys/dev/ata/chipsets/ata-siliconimage.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-siliconimage.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-siliconimage.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-sis.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-sis.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-sis.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 Modified: head/sys/dev/ata/chipsets/ata-via.c ============================================================================== --- head/sys/dev/ata/chipsets/ata-via.c Wed Jun 24 19:47:53 2009 (r194892) +++ head/sys/dev/ata/chipsets/ata-via.c Wed Jun 24 19:49:18 2009 (r194893) @@ -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 _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"