diff options
| author | mav <mav@FreeBSD.org> | 2015-03-24 18:09:07 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-03-24 18:09:07 +0000 |
| commit | ebd96ed35ad94573492ded1c092b18aa0dd92065 (patch) | |
| tree | 48bf4ad0fd382e08141106dbc28b6dcbe1553ab5 /sys/dev/ata/chipsets/ata-nvidia.c | |
| parent | d3609225f5ea633dc50084a98df6590e32dc762e (diff) | |
| download | FreeBSD-src-ebd96ed35ad94573492ded1c092b18aa0dd92065.zip FreeBSD-src-ebd96ed35ad94573492ded1c092b18aa0dd92065.tar.gz | |
Remove from legacy ata(4) driver support for hardware, supported by newer
and more functional drivers ahci(4), siis(4) and mvs(4).
This removes about 3400 lines of code, unused since FreeBSD 9.0 release.
Diffstat (limited to 'sys/dev/ata/chipsets/ata-nvidia.c')
| -rw-r--r-- | sys/dev/ata/chipsets/ata-nvidia.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sys/dev/ata/chipsets/ata-nvidia.c b/sys/dev/ata/chipsets/ata-nvidia.c index 5a7a381..1d17981 100644 --- a/sys/dev/ata/chipsets/ata-nvidia.c +++ b/sys/dev/ata/chipsets/ata-nvidia.c @@ -62,10 +62,6 @@ static int ata_nvidia_setmode(device_t dev, int target, int mode); #define NV4 0x01 #define NVQ 0x02 #define NVAHCI 0x04 -#define NVNOFORCE 0x08 - -static int force_ahci = 1; -TUNABLE_INT("hw.ahci.force", &force_ahci); /* * nVidia chipset support functions @@ -161,7 +157,7 @@ ata_nvidia_probe(device_t dev) { ATA_NFORCE_MCP79_AA, 0, NVAHCI, 0, ATA_SA300, "nForce MCP79" }, { ATA_NFORCE_MCP79_AB, 0, NVAHCI, 0, ATA_SA300, "nForce MCP79" }, { ATA_NFORCE_MCP89_A0, 0, NVAHCI, 0, ATA_SA300, "nForce MCP89" }, - { ATA_NFORCE_MCP89_A1, 0, NVAHCI|NVNOFORCE, 0, ATA_SA300, "nForce MCP89" }, + { ATA_NFORCE_MCP89_A1, 0, NVAHCI, 0, ATA_SA300, "nForce MCP89" }, { ATA_NFORCE_MCP89_A2, 0, NVAHCI, 0, ATA_SA300, "nForce MCP89" }, { ATA_NFORCE_MCP89_A3, 0, NVAHCI, 0, ATA_SA300, "nForce MCP89" }, { ATA_NFORCE_MCP89_A4, 0, NVAHCI, 0, ATA_SA300, "nForce MCP89" }, @@ -180,13 +176,12 @@ ata_nvidia_probe(device_t dev) if (!(ctlr->chip = ata_match_chip(dev, ids))) return ENXIO; - ata_set_desc(dev); if ((ctlr->chip->cfg1 & NVAHCI) && - ((force_ahci == 1 && (ctlr->chip->cfg1 & NVNOFORCE) == 0) || - pci_get_subclass(dev) != PCIS_STORAGE_IDE)) - ctlr->chipinit = ata_ahci_chipinit; - else - ctlr->chipinit = ata_nvidia_chipinit; + pci_get_subclass(dev) != PCIS_STORAGE_IDE) + return (ENXIO); + + ata_set_desc(dev); + ctlr->chipinit = ata_nvidia_chipinit; return (BUS_PROBE_LOW_PRIORITY); } @@ -351,4 +346,3 @@ ata_nvidia_setmode(device_t dev, int target, int mode) } ATA_DECLARE_DRIVER(ata_nvidia); -MODULE_DEPEND(ata_nvidia, ata_ahci, 1, 1, 1); |
