diff options
Diffstat (limited to 'drivers/ide/cris/ide-cris.c')
-rw-r--r-- | drivers/ide/cris/ide-cris.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c index 67cec8916fcd..7c90218e9319 100644 --- a/drivers/ide/cris/ide-cris.c +++ b/drivers/ide/cris/ide-cris.c | |||
@@ -680,12 +680,10 @@ static void cris_dma_off(ide_drive_t *drive) | |||
680 | { | 680 | { |
681 | } | 681 | } |
682 | 682 | ||
683 | static void tune_cris_ide(ide_drive_t *drive, u8 pio) | 683 | static void cris_set_pio_mode(ide_drive_t *drive, const u8 pio) |
684 | { | 684 | { |
685 | int setup, strobe, hold; | 685 | int setup, strobe, hold; |
686 | 686 | ||
687 | pio = ide_get_best_pio_mode(drive, pio, 4); | ||
688 | |||
689 | switch(pio) | 687 | switch(pio) |
690 | { | 688 | { |
691 | case 0: | 689 | case 0: |
@@ -727,7 +725,7 @@ static int speed_cris_ide(ide_drive_t *drive, const u8 speed) | |||
727 | int cyc = 0, dvs = 0, strobe = 0, hold = 0; | 725 | int cyc = 0, dvs = 0, strobe = 0, hold = 0; |
728 | 726 | ||
729 | if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) { | 727 | if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) { |
730 | tune_cris_ide(drive, speed - XFER_PIO_0); | 728 | cris_set_pio_mode(drive, speed - XFER_PIO_0); |
731 | return ide_config_drive_speed(drive, speed); | 729 | return ide_config_drive_speed(drive, speed); |
732 | } | 730 | } |
733 | 731 | ||
@@ -797,7 +795,7 @@ init_e100_ide (void) | |||
797 | ide_register_hw(&hw, 1, &hwif); | 795 | ide_register_hw(&hw, 1, &hwif); |
798 | hwif->mmio = 1; | 796 | hwif->mmio = 1; |
799 | hwif->chipset = ide_etrax100; | 797 | hwif->chipset = ide_etrax100; |
800 | hwif->tuneproc = &tune_cris_ide; | 798 | hwif->set_pio_mode = &cris_set_pio_mode; |
801 | hwif->speedproc = &speed_cris_ide; | 799 | hwif->speedproc = &speed_cris_ide; |
802 | hwif->ata_input_data = &cris_ide_input_data; | 800 | hwif->ata_input_data = &cris_ide_input_data; |
803 | hwif->ata_output_data = &cris_ide_output_data; | 801 | hwif->ata_output_data = &cris_ide_output_data; |