diff options
Diffstat (limited to 'drivers/ide/pci/sgiioc4.c')
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index d9aa20012fc0..fd09b295a69d 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -279,7 +279,7 @@ sgiioc4_ide_dma_on(ide_drive_t * drive) | |||
279 | { | 279 | { |
280 | drive->using_dma = 1; | 280 | drive->using_dma = 1; |
281 | 281 | ||
282 | return HWIF(drive)->ide_dma_host_on(drive); | 282 | return 0; |
283 | } | 283 | } |
284 | 284 | ||
285 | static void sgiioc4_dma_off_quietly(ide_drive_t *drive) | 285 | static void sgiioc4_dma_off_quietly(ide_drive_t *drive) |
@@ -307,13 +307,8 @@ sgiioc4_ide_dma_test_irq(ide_drive_t * drive) | |||
307 | return sgiioc4_checkirq(HWIF(drive)); | 307 | return sgiioc4_checkirq(HWIF(drive)); |
308 | } | 308 | } |
309 | 309 | ||
310 | static int | 310 | static void sgiioc4_dma_host_on(ide_drive_t * drive) |
311 | sgiioc4_ide_dma_host_on(ide_drive_t * drive) | ||
312 | { | 311 | { |
313 | if (drive->using_dma) | ||
314 | return 0; | ||
315 | |||
316 | return 1; | ||
317 | } | 312 | } |
318 | 313 | ||
319 | static void sgiioc4_dma_host_off(ide_drive_t * drive) | 314 | static void sgiioc4_dma_host_off(ide_drive_t * drive) |
@@ -610,7 +605,7 @@ ide_init_sgiioc4(ide_hwif_t * hwif) | |||
610 | hwif->ide_dma_on = &sgiioc4_ide_dma_on; | 605 | hwif->ide_dma_on = &sgiioc4_ide_dma_on; |
611 | hwif->dma_off_quietly = &sgiioc4_dma_off_quietly; | 606 | hwif->dma_off_quietly = &sgiioc4_dma_off_quietly; |
612 | hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq; | 607 | hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq; |
613 | hwif->ide_dma_host_on = &sgiioc4_ide_dma_host_on; | 608 | hwif->dma_host_on = &sgiioc4_dma_host_on; |
614 | hwif->dma_host_off = &sgiioc4_dma_host_off; | 609 | hwif->dma_host_off = &sgiioc4_dma_host_off; |
615 | hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq; | 610 | hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq; |
616 | hwif->ide_dma_timeout = &__ide_dma_timeout; | 611 | hwif->ide_dma_timeout = &__ide_dma_timeout; |