diff options
Diffstat (limited to 'drivers/ide/pci')
-rw-r--r-- | drivers/ide/pci/sc1200.c | 2 | ||||
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index fef20bd4aa78..8a94c3e8f7c4 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c | |||
@@ -220,7 +220,7 @@ static void sc1200_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
220 | } | 220 | } |
221 | if (mode != -1) { | 221 | if (mode != -1) { |
222 | printk("SC1200: %s: changing (U)DMA mode\n", drive->name); | 222 | printk("SC1200: %s: changing (U)DMA mode\n", drive->name); |
223 | hwif->dma_off_quietly(drive); | 223 | ide_dma_off_quietly(drive); |
224 | if (ide_set_dma_mode(drive, mode) == 0) | 224 | if (ide_set_dma_mode(drive, mode) == 0) |
225 | hwif->dma_host_on(drive); | 225 | hwif->dma_host_on(drive); |
226 | return; | 226 | return; |
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index fea56d3b3a3a..8c4e94bd4449 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -277,23 +277,6 @@ sgiioc4_ide_dma_end(ide_drive_t * drive) | |||
277 | return dma_stat; | 277 | return dma_stat; |
278 | } | 278 | } |
279 | 279 | ||
280 | static int | ||
281 | sgiioc4_ide_dma_on(ide_drive_t * drive) | ||
282 | { | ||
283 | drive->using_dma = 1; | ||
284 | ide_toggle_bounce(drive, 1); | ||
285 | |||
286 | return 0; | ||
287 | } | ||
288 | |||
289 | static void sgiioc4_dma_off_quietly(ide_drive_t *drive) | ||
290 | { | ||
291 | drive->using_dma = 0; | ||
292 | ide_toggle_bounce(drive, 0); | ||
293 | |||
294 | drive->hwif->dma_host_off(drive); | ||
295 | } | ||
296 | |||
297 | static void sgiioc4_set_dma_mode(ide_drive_t *drive, const u8 speed) | 280 | static void sgiioc4_set_dma_mode(ide_drive_t *drive, const u8 speed) |
298 | { | 281 | { |
299 | } | 282 | } |
@@ -598,8 +581,6 @@ ide_init_sgiioc4(ide_hwif_t * hwif) | |||
598 | hwif->dma_setup = &sgiioc4_ide_dma_setup; | 581 | hwif->dma_setup = &sgiioc4_ide_dma_setup; |
599 | hwif->dma_start = &sgiioc4_ide_dma_start; | 582 | hwif->dma_start = &sgiioc4_ide_dma_start; |
600 | hwif->ide_dma_end = &sgiioc4_ide_dma_end; | 583 | hwif->ide_dma_end = &sgiioc4_ide_dma_end; |
601 | hwif->ide_dma_on = &sgiioc4_ide_dma_on; | ||
602 | hwif->dma_off_quietly = &sgiioc4_dma_off_quietly; | ||
603 | hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq; | 584 | hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq; |
604 | hwif->dma_host_on = &sgiioc4_dma_host_on; | 585 | hwif->dma_host_on = &sgiioc4_dma_host_on; |
605 | hwif->dma_host_off = &sgiioc4_dma_host_off; | 586 | hwif->dma_host_off = &sgiioc4_dma_host_off; |