diff options
Diffstat (limited to 'drivers/ide/pci/sgiioc4.c')
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index c292e1de1d56..26352626c0e8 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -291,12 +291,8 @@ static void sgiioc4_dma_off_quietly(ide_drive_t *drive) | |||
291 | drive->hwif->dma_host_off(drive); | 291 | drive->hwif->dma_host_off(drive); |
292 | } | 292 | } |
293 | 293 | ||
294 | static int sgiioc4_speedproc(ide_drive_t *drive, const u8 speed) | 294 | static void sgiioc4_set_dma_mode(ide_drive_t *drive, const u8 speed) |
295 | { | 295 | { |
296 | if (speed != XFER_MW_DMA_2) | ||
297 | return 1; | ||
298 | |||
299 | return ide_config_drive_speed(drive, speed); | ||
300 | } | 296 | } |
301 | 297 | ||
302 | static int sgiioc4_ide_dma_check(ide_drive_t *drive) | 298 | static int sgiioc4_ide_dma_check(ide_drive_t *drive) |
@@ -595,7 +591,7 @@ ide_init_sgiioc4(ide_hwif_t * hwif) | |||
595 | hwif->mwdma_mask = 0x04; | 591 | hwif->mwdma_mask = 0x04; |
596 | hwif->pio_mask = 0x00; | 592 | hwif->pio_mask = 0x00; |
597 | hwif->set_pio_mode = NULL; /* Sets timing for PIO mode */ | 593 | hwif->set_pio_mode = NULL; /* Sets timing for PIO mode */ |
598 | hwif->speedproc = &sgiioc4_speedproc; | 594 | hwif->set_dma_mode = &sgiioc4_set_dma_mode; |
599 | hwif->selectproc = NULL;/* Use the default routine to select drive */ | 595 | hwif->selectproc = NULL;/* Use the default routine to select drive */ |
600 | hwif->reset_poll = NULL;/* No HBA specific reset_poll needed */ | 596 | hwif->reset_poll = NULL;/* No HBA specific reset_poll needed */ |
601 | hwif->pre_reset = NULL; /* No HBA specific pre_set needed */ | 597 | hwif->pre_reset = NULL; /* No HBA specific pre_set needed */ |