Signed-off-by: Andrew Morton --- drivers/ide/pci/amd74xx.c | 15 ++++----------- drivers/ide/pci/via82cxxx.c | 15 ++++----------- 2 files changed, 8 insertions(+), 22 deletions(-) diff -puN drivers/ide/pci/amd74xx.c~ide-amd74xx-via82cxxx-use-ide-tune-dma drivers/ide/pci/amd74xx.c --- a/drivers/ide/pci/amd74xx.c~ide-amd74xx-via82cxxx-use-ide-tune-dma +++ a/drivers/ide/pci/amd74xx.c @@ -1,5 +1,5 @@ /* - * Version 2.21 + * Version 2.22 * * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04 * IDE driver for Linux. @@ -276,18 +276,11 @@ static void amd_set_pio_mode(ide_drive_t static int amd74xx_ide_dma_check(ide_drive_t *drive) { - u8 speed = ide_max_dma_mode(drive); - - if (speed == 0) { - ide_set_max_pio(drive); - return -1; - } - - amd_set_drive(drive, speed); - - if (drive->autodma) + if (ide_tune_dma(drive)) return 0; + ide_set_max_pio(drive); + return -1; } diff -puN drivers/ide/pci/via82cxxx.c~ide-amd74xx-via82cxxx-use-ide-tune-dma drivers/ide/pci/via82cxxx.c --- a/drivers/ide/pci/via82cxxx.c~ide-amd74xx-via82cxxx-use-ide-tune-dma +++ a/drivers/ide/pci/via82cxxx.c @@ -1,6 +1,6 @@ /* * - * Version 3.47 + * Version 3.48 * * VIA IDE driver for Linux. Supported southbridges: * @@ -217,18 +217,11 @@ static void via_set_pio_mode(ide_drive_t static int via82cxxx_ide_dma_check (ide_drive_t *drive) { - u8 speed = ide_max_dma_mode(drive); - - if (speed == 0) { - ide_set_max_pio(drive); - return -1; - } - - via_set_drive(drive, speed); - - if (drive->autodma) + if (ide_tune_dma(drive)) return 0; + ide_set_max_pio(drive); + return -1; } _