aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/cris/ide-cris.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/cris/ide-cris.c')
-rw-r--r--drivers/ide/cris/ide-cris.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 4bb42b30bfc0..2b4d2a0ae5c2 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -716,11 +716,9 @@ static void cris_set_pio_mode(ide_drive_t *drive, const u8 pio)
716 } 716 }
717 717
718 cris_ide_set_speed(TYPE_PIO, setup, strobe, hold); 718 cris_ide_set_speed(TYPE_PIO, setup, strobe, hold);
719
720 (void)ide_config_drive_speed(drive, XFER_PIO_0 + pio);
721} 719}
722 720
723static int speed_cris_ide(ide_drive_t *drive, const u8 speed) 721static void cris_set_dma_mode(ide_drive_t *drive, const u8 speed)
724{ 722{
725 int cyc = 0, dvs = 0, strobe = 0, hold = 0; 723 int cyc = 0, dvs = 0, strobe = 0, hold = 0;
726 724
@@ -759,8 +757,6 @@ static int speed_cris_ide(ide_drive_t *drive, const u8 speed)
759 cris_ide_set_speed(TYPE_UDMA, cyc, dvs, 0); 757 cris_ide_set_speed(TYPE_UDMA, cyc, dvs, 0);
760 else 758 else
761 cris_ide_set_speed(TYPE_DMA, 0, strobe, hold); 759 cris_ide_set_speed(TYPE_DMA, 0, strobe, hold);
762
763 return ide_config_drive_speed(drive, speed);
764} 760}
765 761
766void __init 762void __init
@@ -791,7 +787,7 @@ init_e100_ide (void)
791 hwif->mmio = 1; 787 hwif->mmio = 1;
792 hwif->chipset = ide_etrax100; 788 hwif->chipset = ide_etrax100;
793 hwif->set_pio_mode = &cris_set_pio_mode; 789 hwif->set_pio_mode = &cris_set_pio_mode;
794 hwif->speedproc = &speed_cris_ide; 790 hwif->set_dma_mode = &cris_set_dma_mode;
795 hwif->ata_input_data = &cris_ide_input_data; 791 hwif->ata_input_data = &cris_ide_input_data;
796 hwif->ata_output_data = &cris_ide_output_data; 792 hwif->ata_output_data = &cris_ide_output_data;
797 hwif->atapi_input_bytes = &cris_atapi_input_bytes; 793 hwif->atapi_input_bytes = &cris_atapi_input_bytes;