diff options
Diffstat (limited to 'drivers/ide/pci/sis5513.c')
-rw-r--r-- | drivers/ide/pci/sis5513.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index fed582b4b32f..7455bf357ed9 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
@@ -519,14 +519,13 @@ static void config_art_rwp_pio (ide_drive_t *drive, u8 pio) | |||
519 | } | 519 | } |
520 | } | 520 | } |
521 | 521 | ||
522 | static int sis5513_tune_drive(ide_drive_t *drive, u8 pio) | 522 | static int sis5513_tune_drive(ide_drive_t *drive, const u8 pio) |
523 | { | 523 | { |
524 | pio = ide_get_best_pio_mode(drive, pio, 4); | ||
525 | config_art_rwp_pio(drive, pio); | 524 | config_art_rwp_pio(drive, pio); |
526 | return ide_config_drive_speed(drive, XFER_PIO_0 + pio); | 525 | return ide_config_drive_speed(drive, XFER_PIO_0 + pio); |
527 | } | 526 | } |
528 | 527 | ||
529 | static void sis5513_tuneproc(ide_drive_t *drive, u8 pio) | 528 | static void sis_set_pio_mode(ide_drive_t *drive, const u8 pio) |
530 | { | 529 | { |
531 | (void)sis5513_tune_drive(drive, pio); | 530 | (void)sis5513_tune_drive(drive, pio); |
532 | } | 531 | } |
@@ -621,7 +620,7 @@ static int sis5513_config_xfer_rate(ide_drive_t *drive) | |||
621 | /* | 620 | /* |
622 | * TODO: always set PIO mode and remove this | 621 | * TODO: always set PIO mode and remove this |
623 | */ | 622 | */ |
624 | sis5513_tuneproc(drive, 255); | 623 | ide_set_max_pio(drive); |
625 | 624 | ||
626 | drive->init_speed = 0; | 625 | drive->init_speed = 0; |
627 | 626 | ||
@@ -629,7 +628,7 @@ static int sis5513_config_xfer_rate(ide_drive_t *drive) | |||
629 | return 0; | 628 | return 0; |
630 | 629 | ||
631 | if (ide_use_fast_pio(drive)) | 630 | if (ide_use_fast_pio(drive)) |
632 | sis5513_tuneproc(drive, 255); | 631 | ide_set_max_pio(drive); |
633 | 632 | ||
634 | return -1; | 633 | return -1; |
635 | } | 634 | } |
@@ -852,7 +851,7 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif) | |||
852 | if (!hwif->irq) | 851 | if (!hwif->irq) |
853 | hwif->irq = hwif->channel ? 15 : 14; | 852 | hwif->irq = hwif->channel ? 15 : 14; |
854 | 853 | ||
855 | hwif->tuneproc = &sis5513_tuneproc; | 854 | hwif->set_pio_mode = &sis_set_pio_mode; |
856 | hwif->speedproc = &sis5513_tune_chipset; | 855 | hwif->speedproc = &sis5513_tune_chipset; |
857 | 856 | ||
858 | if (chipset_family >= ATA_133) | 857 | if (chipset_family >= ATA_133) |