Messages in this thread Patch in this message | | | Date | Tue, 25 Jun 2002 21:33:14 +0200 (MET DST) | From | Bartlomiej Zolnierkiewicz <> | Subject | [PATCH] ATA: ata66_check removal |
| |
incremental to generic ATA PCI auto-dma and ch->autodma cleanup...
- remove ata66_check entry from struct ata_pci_device, initialise ch->udma_four directly in *_init_channel()
this abstraction wasn't needed and it was PCI specific
-- Bartlomiej Zolnierkiewicz diff -ur linux-ata-autodma/drivers/ide/aec62xx.c linux/drivers/ide/aec62xx.c --- linux-ata-autodma/drivers/ide/aec62xx.c Mon Jun 24 23:55:15 2002 +++ linux/drivers/ide/aec62xx.c Tue Jun 25 00:28:22 2002 @@ -255,6 +255,8 @@ ch->io_32bit = 1; ch->unmask = 1; + ch->udma_four = aec62xx_ata66_check(ch); + for (i = 0; i < 2; i++) { ch->drives[i].autotune = 1; ch->drives[i].dn = ch->unit * 2 + i; @@ -297,7 +299,6 @@ vendor: PCI_VENDOR_ID_ARTOP, device: PCI_DEVICE_ID_ARTOP_ATP860, init_chipset: aec62xx_init_chipset, - ata66_check: aec62xx_ata66_check, init_channel: aec62xx_init_channel, enablebits: { {0x4a,0x02,0x02}, {0x4a,0x04,0x04} }, bootable: NEVER_BOARD, @@ -307,7 +308,6 @@ vendor: PCI_VENDOR_ID_ARTOP, device: PCI_DEVICE_ID_ARTOP_ATP860R, init_chipset: aec62xx_init_chipset, - ata66_check: aec62xx_ata66_check, init_channel: aec62xx_init_channel, enablebits: { {0x4a,0x02,0x02}, {0x4a,0x04,0x04} }, bootable: OFF_BOARD, @@ -317,7 +317,6 @@ vendor: PCI_VENDOR_ID_ARTOP, device: PCI_DEVICE_ID_ARTOP_ATP865, init_chipset: aec62xx_init_chipset, - ata66_check: aec62xx_ata66_check, init_channel: aec62xx_init_channel, enablebits: { {0x4a,0x02,0x02}, {0x4a,0x04,0x04} }, bootable: NEVER_BOARD, @@ -327,7 +326,6 @@ vendor: PCI_VENDOR_ID_ARTOP, device: PCI_DEVICE_ID_ARTOP_ATP865R, init_chipset: aec62xx_init_chipset, - ata66_check: aec62xx_ata66_check, init_channel: aec62xx_init_channel, enablebits: { {0x4a,0x02,0x02}, {0x4a,0x04,0x04} }, bootable: OFF_BOARD, diff -ur linux-ata-autodma/drivers/ide/alim15x3.c linux/drivers/ide/alim15x3.c --- linux-ata-autodma/drivers/ide/alim15x3.c Tue Jun 25 00:09:09 2002 +++ linux/drivers/ide/alim15x3.c Tue Jun 25 00:30:09 2002 @@ -339,6 +339,8 @@ } #endif /* CONFIG_SPARC64 */ + hwif->udma_four = ali15x3_ata66_check(hwif); + hwif->tuneproc = &ali15x3_tune_drive; hwif->drives[0].autotune = 1; hwif->drives[1].autotune = 1; @@ -382,7 +384,6 @@ vendor: PCI_VENDOR_ID_AL, device: PCI_DEVICE_ID_AL_M5229, init_chipset: ali15x3_init_chipset, - ata66_check: ali15x3_ata66_check, init_channel: ali15x3_init_channel, init_dma: ali15x3_init_dma, enablebits: { {0x00,0x00,0x00}, {0x00,0x00,0x00} }, diff -ur linux-ata-autodma/drivers/ide/amd74xx.c linux/drivers/ide/amd74xx.c --- linux-ata-autodma/drivers/ide/amd74xx.c Mon Jun 24 23:28:50 2002 +++ linux/drivers/ide/amd74xx.c Tue Jun 25 00:37:18 2002 @@ -268,6 +268,8 @@ { int i; + hwif->udma_four = amd74xx_ata66_check(hwif); + hwif->tuneproc = &amd74xx_tune_drive; hwif->speedproc = &amd_set_drive; @@ -304,7 +306,6 @@ vendor: PCI_VENDOR_ID_AMD, device: PCI_DEVICE_ID_AMD_COBRA_7401, init_chipset: amd74xx_init_chipset, - ata66_check: amd74xx_ata66_check, init_channel: amd74xx_init_channel, init_dma: amd74xx_init_dma, enablebits: {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, @@ -314,7 +315,6 @@ vendor: PCI_VENDOR_ID_AMD, device: PCI_DEVICE_ID_AMD_VIPER_7409, init_chipset: amd74xx_init_chipset, - ata66_check: amd74xx_ata66_check, init_channel: amd74xx_init_channel, init_dma: amd74xx_init_dma, enablebits: {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, @@ -325,7 +325,6 @@ vendor: PCI_VENDOR_ID_AMD, device: PCI_DEVICE_ID_AMD_VIPER_7411, init_chipset: amd74xx_init_chipset, - ata66_check: amd74xx_ata66_check, init_channel: amd74xx_init_channel, init_dma: amd74xx_init_dma, enablebits: {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, @@ -335,7 +334,6 @@ vendor: PCI_VENDOR_ID_AMD, device: PCI_DEVICE_ID_AMD_OPUS_7441, init_chipset: amd74xx_init_chipset, - ata66_check: amd74xx_ata66_check, init_channel: amd74xx_init_channel, init_dma: amd74xx_init_dma, enablebits: {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, @@ -345,7 +343,6 @@ vendor: PCI_VENDOR_ID_AMD, device: PCI_DEVICE_ID_AMD_8111_IDE, init_chipset: amd74xx_init_chipset, - ata66_check: amd74xx_ata66_check, init_channel: amd74xx_init_channel, init_dma: amd74xx_init_dma, enablebits: {{0x40,0x01,0x01}, {0x40,0x02,0x02}}, @@ -355,7 +352,6 @@ vendor: PCI_VENDOR_ID_NVIDIA, device: PCI_DEVICE_ID_NVIDIA_NFORCE_IDE, init_chipset: amd74xx_init_chipset, - ata66_check: amd74xx_ata66_check, init_channel: amd74xx_init_channel, init_dma: amd74xx_init_dma, enablebits: {{0x50,0x01,0x01}, {0x50,0x02,0x02}}, diff -ur linux-ata-autodma/drivers/ide/cmd64x.c linux/drivers/ide/cmd64x.c --- linux-ata-autodma/drivers/ide/cmd64x.c Mon Jun 24 23:29:08 2002 +++ linux/drivers/ide/cmd64x.c Tue Jun 25 00:26:35 2002 @@ -742,13 +742,6 @@ return (ata66 & mask) ? 1 : 0; } -static unsigned int __init cmd64x_ata66_check(struct ata_channel *hwif) -{ - if (hwif->pci_dev->device == PCI_DEVICE_ID_CMD_680) - return cmd680_ata66(hwif); - return cmd64x_ata66(hwif); -} - static void __init cmd64x_init_channel(struct ata_channel *hwif) { struct pci_dev *dev = hwif->pci_dev; @@ -766,6 +759,7 @@ hwif->resetproc = cmd680_reset; hwif->speedproc = cmd680_tune_chipset; hwif->tuneproc = cmd680_tuneproc; + hwif->udma_four = cmd680_ata66(hwif); break; case PCI_DEVICE_ID_CMD_649: case PCI_DEVICE_ID_CMD_648: @@ -778,6 +772,7 @@ #endif hwif->tuneproc = cmd64x_tuneproc; hwif->speedproc = cmd64x_tune_chipset; + hwif->udma_four = cmd64x_ata66(hwif); break; case PCI_DEVICE_ID_CMD_646: hwif->chipset = ide_cmd646; @@ -793,6 +788,7 @@ #endif hwif->tuneproc = cmd64x_tuneproc; hwif->speedproc = cmd64x_tune_chipset; + hwif->udma_four = cmd64x_ata66(hwif); break; default: break; @@ -832,7 +828,6 @@ vendor: PCI_VENDOR_ID_CMD, device: PCI_DEVICE_ID_CMD_648, init_chipset: cmd64x_init_chipset, - ata66_check: cmd64x_ata66_check, init_channel: cmd64x_init_channel, bootable: ON_BOARD, flags: ATA_F_DMA @@ -841,7 +836,6 @@ vendor: PCI_VENDOR_ID_CMD, device: PCI_DEVICE_ID_CMD_649, init_chipset: cmd64x_init_chipset, - ata66_check: cmd64x_ata66_check, init_channel: cmd64x_init_channel, bootable: ON_BOARD, flags: ATA_F_DMA @@ -850,7 +844,6 @@ vendor: PCI_VENDOR_ID_CMD, device: PCI_DEVICE_ID_CMD_680, init_chipset: cmd64x_init_chipset, - ata66_check: cmd64x_ata66_check, init_channel: cmd64x_init_channel, bootable: ON_BOARD, flags: ATA_F_DMA diff -ur linux-ata-autodma/drivers/ide/hpt366.c linux/drivers/ide/hpt366.c --- linux-ata-autodma/drivers/ide/hpt366.c Mon Jun 24 23:30:39 2002 +++ linux/drivers/ide/hpt366.c Tue Jun 25 00:30:54 2002 @@ -1145,6 +1145,8 @@ struct pci_dev *dev = ch->pci_dev; u32 rev = hpt_revision(dev); + ch->udma_four = hpt366_ata66_check(ch); + ch->tuneproc = hpt3xx_tune_drive; ch->speedproc = hpt3xx_tune_chipset; ch->quirkproc = hpt3xx_quirkproc; @@ -1223,7 +1225,6 @@ vendor: PCI_VENDOR_ID_TTI, device: PCI_DEVICE_ID_TTI_HPT366, init_chipset: hpt366_init_chipset, - ata66_check: hpt366_ata66_check, init_channel: hpt366_init_channel, init_dma: hpt366_init_dma, bootable: OFF_BOARD, @@ -1234,7 +1235,6 @@ vendor: PCI_VENDOR_ID_TTI, device: PCI_DEVICE_ID_TTI_HPT372, init_chipset: hpt366_init_chipset, - ata66_check: hpt366_ata66_check, init_channel: hpt366_init_channel, init_dma: hpt366_init_dma, bootable: OFF_BOARD, @@ -1245,7 +1245,6 @@ vendor: PCI_VENDOR_ID_TTI, device: PCI_DEVICE_ID_TTI_HPT374, init_chipset: hpt366_init_chipset, - ata66_check: hpt366_ata66_check, init_channel: hpt366_init_channel, init_dma: hpt366_init_dma, bootable: OFF_BOARD, diff -ur linux-ata-autodma/drivers/ide/ide-pci.c linux/drivers/ide/ide-pci.c --- linux-ata-autodma/drivers/ide/ide-pci.c Tue Jun 25 00:03:46 2002 +++ linux/drivers/ide/ide-pci.c Tue Jun 25 00:29:04 2002 @@ -257,13 +257,8 @@ if (d->flags & ATA_F_NODMA) goto no_dma; - /* Check whatever this interface is UDMA4 mode capable. */ - if (ch->udma_four) { + if (ch->udma_four) printk("%s: warning: ATA-66/100 forced bit set!\n", dev->name); - } else { - if (d->ata66_check) - ch->udma_four = d->ata66_check(ch); - } #ifdef CONFIG_BLK_DEV_IDEDMA /* diff -ur linux-ata-autodma/drivers/ide/pcihost.h linux/drivers/ide/pcihost.h --- linux-ata-autodma/drivers/ide/pcihost.h Fri Jun 7 23:04:30 2002 +++ linux/drivers/ide/pcihost.h Tue Jun 25 00:38:30 2002 @@ -117,7 +117,6 @@ unsigned short vendor; unsigned short device; unsigned int (*init_chipset)(struct pci_dev *); - unsigned int (*ata66_check)(struct ata_channel *); void (*init_channel)(struct ata_channel *); void (*init_dma)(struct ata_channel *, unsigned long); ide_pci_enablebit_t enablebits[2]; diff -ur linux-ata-autodma/drivers/ide/pdc202xx.c linux/drivers/ide/pdc202xx.c --- linux-ata-autodma/drivers/ide/pdc202xx.c Mon Jun 24 23:31:59 2002 +++ linux/drivers/ide/pdc202xx.c Tue Jun 25 00:35:15 2002 @@ -652,6 +652,8 @@ case PCI_DEVICE_ID_PROMISE_20269: case PCI_DEVICE_ID_PROMISE_20268: case PCI_DEVICE_ID_PROMISE_20268R: + hwif->udma_four = pdc202xx_tx_ata66_check(hwif); + hwif->speedproc = &pdc202xx_new_tune_chipset; hwif->resetproc = &pdc202xx_new_reset; #ifdef CONFIG_BLK_DEV_IDEDMA @@ -662,6 +664,8 @@ case PCI_DEVICE_ID_PROMISE_20267: case PCI_DEVICE_ID_PROMISE_20265: case PCI_DEVICE_ID_PROMISE_20262: + hwif->udma_four = pdc202xx_ata66_check(hwif); + hwif->resetproc = &pdc202xx_reset; #ifdef CONFIG_BLK_DEV_IDEDMA /* we need special functions for lba48 */ @@ -702,7 +706,6 @@ vendor: PCI_VENDOR_ID_PROMISE, device: PCI_DEVICE_ID_PROMISE_20246, init_chipset: pdc202xx_init_chipset, - ata66_check: NULL, init_channel: ide_init_pdc202xx, #ifndef CONFIG_PDC202XX_FORCE enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, @@ -715,7 +718,6 @@ vendor: PCI_VENDOR_ID_PROMISE, device: PCI_DEVICE_ID_PROMISE_20262, init_chipset: pdc202xx_init_chipset, - ata66_check: pdc202xx_ata66_check, init_channel: ide_init_pdc202xx, #ifndef CONFIG_PDC202XX_FORCE enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, @@ -728,7 +730,6 @@ vendor: PCI_VENDOR_ID_PROMISE, device: PCI_DEVICE_ID_PROMISE_20265, init_chipset: pdc202xx_init_chipset, - ata66_check: pdc202xx_ata66_check, init_channel: ide_init_pdc202xx, #ifndef CONFIG_PDC202XX_FORCE enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, @@ -743,7 +744,6 @@ vendor: PCI_VENDOR_ID_PROMISE, device: PCI_DEVICE_ID_PROMISE_20267, init_chipset: pdc202xx_init_chipset, - ata66_check: pdc202xx_ata66_check, init_channel: ide_init_pdc202xx, #ifndef CONFIG_PDC202XX_FORCE enablebits: {{0x50,0x02,0x02}, {0x50,0x04,0x04}}, @@ -756,7 +756,6 @@ vendor: PCI_VENDOR_ID_PROMISE, device: PCI_DEVICE_ID_PROMISE_20268, init_chipset: pdc202xx_tx_init_chipset, - ata66_check: pdc202xx_tx_ata66_check, init_channel: ide_init_pdc202xx, bootable: OFF_BOARD, flags: ATA_F_IRQ | ATA_F_DMA @@ -769,7 +768,6 @@ vendor: PCI_VENDOR_ID_PROMISE, device: PCI_DEVICE_ID_PROMISE_20268R, init_chipset: pdc202xx_tx_init_chipset, - ata66_check: pdc202xx_tx_ata66_check, init_channel: ide_init_pdc202xx, bootable: OFF_BOARD, flags: ATA_F_IRQ | ATA_F_DMA @@ -778,7 +776,6 @@ vendor: PCI_VENDOR_ID_PROMISE, device: PCI_DEVICE_ID_PROMISE_20269, init_chipset: pdc202xx_tx_init_chipset, - ata66_check: pdc202xx_tx_ata66_check, init_channel: ide_init_pdc202xx, bootable: OFF_BOARD, flags: ATA_F_IRQ | ATA_F_DMA @@ -787,7 +784,6 @@ vendor: PCI_VENDOR_ID_PROMISE, device: PCI_DEVICE_ID_PROMISE_20275, init_chipset: pdc202xx_tx_init_chipset, - ata66_check: pdc202xx_tx_ata66_check, init_channel: ide_init_pdc202xx, bootable: OFF_BOARD, flags: ATA_F_IRQ | ATA_F_DMA @@ -796,7 +792,6 @@ vendor: PCI_VENDOR_ID_PROMISE, device: PCI_DEVICE_ID_PROMISE_20276, init_chipset: pdc202xx_tx_init_chipset, - ata66_check: pdc202xx_tx_ata66_check, init_channel: ide_init_pdc202xx, bootable: OFF_BOARD, flags: ATA_F_IRQ | ATA_F_DMA diff -ur linux-ata-autodma/drivers/ide/piix.c linux/drivers/ide/piix.c --- linux-ata-autodma/drivers/ide/piix.c Mon Jun 24 23:33:39 2002 +++ linux/drivers/ide/piix.c Tue Jun 25 00:32:04 2002 @@ -352,6 +352,8 @@ { int i; + ch->udma_four = piix_ata66_check(ch); + ch->tuneproc = &piix_tune_drive; ch->speedproc = &piix_set_drive; ch->io_32bit = 1; @@ -389,7 +391,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82371FB_1, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -399,7 +400,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82371SB_1, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -409,7 +409,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82371AB, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -419,7 +418,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82443MX_1, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -429,7 +427,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82372FB_1, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -439,7 +436,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82801AA_1, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -449,7 +445,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82801AB_1, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -459,7 +454,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82801BA_9, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -469,7 +463,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82801BA_8, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -479,7 +472,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82801E_9, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -489,7 +481,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82801CA_10, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -499,7 +490,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82801CA_11, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -509,7 +499,6 @@ vendor: PCI_VENDOR_ID_INTEL, device: PCI_DEVICE_ID_INTEL_82801DB_9, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, @@ -519,7 +508,6 @@ vendor: PCI_VENDOR_ID_EFAR, device: PCI_DEVICE_ID_EFAR_SLC90E66_1, init_chipset: piix_init_chipset, - ata66_check: piix_ata66_check, init_channel: piix_init_channel, init_dma: piix_init_dma, enablebits: {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, diff -ur linux-ata-autodma/drivers/ide/serverworks.c linux/drivers/ide/serverworks.c --- linux-ata-autodma/drivers/ide/serverworks.c Mon Jun 24 23:34:08 2002 +++ linux/drivers/ide/serverworks.c Tue Jun 25 00:37:47 2002 @@ -369,6 +369,8 @@ if (!hwif->irq) hwif->irq = hwif->unit ? 15 : 14; + hwif->udma_four = svwks_ata66_check(hwif); + hwif->tuneproc = &svwks_tune_drive; hwif->speedproc = &svwks_tune_chipset; @@ -395,7 +397,6 @@ vendor: PCI_VENDOR_ID_SERVERWORKS, device: PCI_DEVICE_ID_SERVERWORKS_OSB4IDE, init_chipset: svwks_init_chipset, - ata66_check: svwks_ata66_check, init_channel: ide_init_svwks, bootable: ON_BOARD, flags: ATA_F_DMA @@ -404,7 +405,6 @@ vendor: PCI_VENDOR_ID_SERVERWORKS, device: PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, init_chipset: svwks_init_chipset, - ata66_check: svwks_ata66_check, init_channel: ide_init_svwks, bootable: ON_BOARD, flags: ATA_F_SIMPLEX diff -ur linux-ata-autodma/drivers/ide/sis5513.c linux/drivers/ide/sis5513.c --- linux-ata-autodma/drivers/ide/sis5513.c Mon Jun 24 23:56:11 2002 +++ linux/drivers/ide/sis5513.c Tue Jun 25 00:32:51 2002 @@ -489,6 +489,8 @@ hwif->irq = hwif->unit ? 15 : 14; + hwif->udma_four = ata66_sis5513(hwif); + hwif->tuneproc = &sis5513_tune_drive; hwif->speedproc = &sis5513_tune_chipset; @@ -509,7 +511,6 @@ vendor: PCI_VENDOR_ID_SI, device: PCI_DEVICE_ID_SI_5513, init_chipset: pci_init_sis5513, - ata66_check: ata66_sis5513, init_channel: ide_init_sis5513, enablebits: {{0x4a,0x02,0x02}, {0x4a,0x04,0x04} }, bootable: ON_BOARD, diff -ur linux-ata-autodma/drivers/ide/via82cxxx.c linux/drivers/ide/via82cxxx.c --- linux-ata-autodma/drivers/ide/via82cxxx.c Mon Jun 24 23:56:17 2002 +++ linux/drivers/ide/via82cxxx.c Tue Jun 25 00:36:45 2002 @@ -346,6 +346,8 @@ { int i; + hwif->udma_four = via82cxxx_ata66_check(hwif); + hwif->tuneproc = &via82cxxx_tune_drive; hwif->speedproc = &via_set_drive; hwif->io_32bit = 1; @@ -381,7 +383,6 @@ vendor: PCI_VENDOR_ID_VIA, device: PCI_DEVICE_ID_VIA_82C576_1, init_chipset: via82cxxx_init_chipset, - ata66_check: via82cxxx_ata66_check, init_channel: via82cxxx_init_channel, init_dma: via82cxxx_init_dma, enablebits: {{0x40,0x02,0x02}, {0x40,0x01,0x01}}, @@ -391,7 +392,6 @@ vendor: PCI_VENDOR_ID_VIA, device: PCI_DEVICE_ID_VIA_82C586_1, init_chipset: via82cxxx_init_chipset, - ata66_check: via82cxxx_ata66_check, init_channel: via82cxxx_init_channel, init_dma: via82cxxx_init_dma, enablebits: {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
| |