diff options
Diffstat (limited to 'drivers/ide/pci/scc_pata.c')
-rw-r--r-- | drivers/ide/pci/scc_pata.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c index a19687caf65a..3505d57eda18 100644 --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c | |||
@@ -221,9 +221,8 @@ static void scc_tune_pio(ide_drive_t *drive, const u8 pio) | |||
221 | out_be32((void __iomem *)pioct_port, reg); | 221 | out_be32((void __iomem *)pioct_port, reg); |
222 | } | 222 | } |
223 | 223 | ||
224 | static void scc_tuneproc(ide_drive_t *drive, u8 pio) | 224 | static void scc_set_pio_mode(ide_drive_t *drive, const u8 pio) |
225 | { | 225 | { |
226 | pio = ide_get_best_pio_mode(drive, pio, 4); | ||
227 | scc_tune_pio(drive, pio); | 226 | scc_tune_pio(drive, pio); |
228 | ide_config_drive_speed(drive, XFER_PIO_0 + pio); | 227 | ide_config_drive_speed(drive, XFER_PIO_0 + pio); |
229 | } | 228 | } |
@@ -316,7 +315,7 @@ static int scc_config_drive_for_dma(ide_drive_t *drive) | |||
316 | return 0; | 315 | return 0; |
317 | 316 | ||
318 | if (ide_use_fast_pio(drive)) | 317 | if (ide_use_fast_pio(drive)) |
319 | scc_tuneproc(drive, 255); | 318 | ide_set_max_pio(drive); |
320 | 319 | ||
321 | return -1; | 320 | return -1; |
322 | } | 321 | } |
@@ -717,7 +716,7 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif) | |||
717 | hwif->dma_setup = scc_dma_setup; | 716 | hwif->dma_setup = scc_dma_setup; |
718 | hwif->ide_dma_end = scc_ide_dma_end; | 717 | hwif->ide_dma_end = scc_ide_dma_end; |
719 | hwif->speedproc = scc_tune_chipset; | 718 | hwif->speedproc = scc_tune_chipset; |
720 | hwif->tuneproc = scc_tuneproc; | 719 | hwif->set_pio_mode = scc_set_pio_mode; |
721 | hwif->ide_dma_check = scc_config_drive_for_dma; | 720 | hwif->ide_dma_check = scc_config_drive_for_dma; |
722 | hwif->ide_dma_test_irq = scc_dma_test_irq; | 721 | hwif->ide_dma_test_irq = scc_dma_test_irq; |
723 | hwif->udma_filter = scc_udma_filter; | 722 | hwif->udma_filter = scc_udma_filter; |