diff options
Diffstat (limited to 'drivers/ide/cris/ide-cris.c')
| -rw-r--r-- | drivers/ide/cris/ide-cris.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c index c04cb25a01ff..ca0341c05e55 100644 --- a/drivers/ide/cris/ide-cris.c +++ b/drivers/ide/cris/ide-cris.c | |||
| @@ -1002,18 +1002,6 @@ static int cris_ide_build_dmatable (ide_drive_t *drive) | |||
| 1002 | return 1; /* let the PIO routines handle this weirdness */ | 1002 | return 1; /* let the PIO routines handle this weirdness */ |
| 1003 | } | 1003 | } |
| 1004 | 1004 | ||
| 1005 | static int cris_config_drive_for_dma (ide_drive_t *drive) | ||
| 1006 | { | ||
| 1007 | u8 speed = ide_max_dma_mode(drive); | ||
| 1008 | |||
| 1009 | if (!speed) | ||
| 1010 | return 0; | ||
| 1011 | |||
| 1012 | speed_cris_ide(drive, speed); | ||
| 1013 | |||
| 1014 | return ide_dma_enable(drive); | ||
| 1015 | } | ||
| 1016 | |||
| 1017 | /* | 1005 | /* |
| 1018 | * cris_dma_intr() is the handler for disk read/write DMA interrupts | 1006 | * cris_dma_intr() is the handler for disk read/write DMA interrupts |
| 1019 | */ | 1007 | */ |
| @@ -1043,7 +1031,7 @@ static ide_startstop_t cris_dma_intr (ide_drive_t *drive) | |||
| 1043 | 1031 | ||
| 1044 | static int cris_dma_check(ide_drive_t *drive) | 1032 | static int cris_dma_check(ide_drive_t *drive) |
| 1045 | { | 1033 | { |
| 1046 | if (ide_use_dma(drive) && cris_config_drive_for_dma(drive)) | 1034 | if (ide_tune_dma(drive)) |
| 1047 | return 0; | 1035 | return 0; |
| 1048 | 1036 | ||
| 1049 | return -1; | 1037 | return -1; |
