diff options
author | jkim <jkim@FreeBSD.org> | 2009-04-27 21:34:15 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2009-04-27 21:34:15 +0000 |
commit | 4d22ff6eef0381ec2b0a56f18dac875f4f490339 (patch) | |
tree | e7353434d66ce928f79585766d1d5af7dd49ff16 /sys/dev/ata | |
parent | a12cc82f1a9f7b092795ca96ff1a6fac818cb536 (diff) | |
download | FreeBSD-src-4d22ff6eef0381ec2b0a56f18dac875f4f490339.zip FreeBSD-src-4d22ff6eef0381ec2b0a56f18dac875f4f490339.tar.gz |
- Give generic AHCI driver lower priority than device-specific drivers.
- Consistently use BUS_PROBE_GENERIC instead of -100.
Diffstat (limited to 'sys/dev/ata')
-rw-r--r-- | sys/dev/ata/ata-pci.c | 6 | ||||
-rw-r--r-- | sys/dev/ata/chipsets/ata-ahci.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index dd6c3f1..a903da7 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -70,18 +70,18 @@ ata_pci_probe(device_t dev) /* is this a storage class device ? */ if (pci_get_class(dev) != PCIC_STORAGE) - return ENXIO; + return (ENXIO); /* is this an IDE/ATA type device ? */ if (pci_get_subclass(dev) != PCIS_STORAGE_IDE) - return ENXIO; + return (ENXIO); sprintf(buffer, "%s ATA controller", ata_pcivendor2str(dev)); device_set_desc_copy(dev, buffer); ctlr->chipinit = ata_generic_chipinit; /* we are a low priority handler */ - return -100; + return (BUS_PROBE_GENERIC); } int diff --git a/sys/dev/ata/chipsets/ata-ahci.c b/sys/dev/ata/chipsets/ata-ahci.c index d48ec26..937ace5 100644 --- a/sys/dev/ata/chipsets/ata-ahci.c +++ b/sys/dev/ata/chipsets/ata-ahci.c @@ -85,7 +85,7 @@ ata_ahci_probe(device_t dev) /* is this PCI device flagged as an AHCI compliant chip ? */ if (pci_read_config(dev, PCIR_PROGIF, 1) != PCIP_STORAGE_SATA_AHCI_1_0) - return ENXIO; + return (ENXIO); if (bootverbose) sprintf(buffer, "%s (ID=%08x) AHCI controller", @@ -94,7 +94,7 @@ ata_ahci_probe(device_t dev) sprintf(buffer, "%s AHCI controller", ata_pcivendor2str(dev)); device_set_desc_copy(dev, buffer); ctlr->chipinit = ata_ahci_chipinit; - return 0; + return (BUS_PROBE_GENERIC); } int |