diff options
Diffstat (limited to 'drivers/ide/pci/sgiioc4.c')
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index cb5c3211bd8e..d9aa20012fc0 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -282,12 +282,11 @@ sgiioc4_ide_dma_on(ide_drive_t * drive) | |||
282 | return HWIF(drive)->ide_dma_host_on(drive); | 282 | return HWIF(drive)->ide_dma_host_on(drive); |
283 | } | 283 | } |
284 | 284 | ||
285 | static int | 285 | static void sgiioc4_dma_off_quietly(ide_drive_t *drive) |
286 | sgiioc4_ide_dma_off_quietly(ide_drive_t * drive) | ||
287 | { | 286 | { |
288 | drive->using_dma = 0; | 287 | drive->using_dma = 0; |
289 | 288 | ||
290 | return HWIF(drive)->ide_dma_host_off(drive); | 289 | drive->hwif->dma_host_off(drive); |
291 | } | 290 | } |
292 | 291 | ||
293 | static int sgiioc4_ide_dma_check(ide_drive_t *drive) | 292 | static int sgiioc4_ide_dma_check(ide_drive_t *drive) |
@@ -317,12 +316,9 @@ sgiioc4_ide_dma_host_on(ide_drive_t * drive) | |||
317 | return 1; | 316 | return 1; |
318 | } | 317 | } |
319 | 318 | ||
320 | static int | 319 | static void sgiioc4_dma_host_off(ide_drive_t * drive) |
321 | sgiioc4_ide_dma_host_off(ide_drive_t * drive) | ||
322 | { | 320 | { |
323 | sgiioc4_clearirq(drive); | 321 | sgiioc4_clearirq(drive); |
324 | |||
325 | return 0; | ||
326 | } | 322 | } |
327 | 323 | ||
328 | static int | 324 | static int |
@@ -612,10 +608,10 @@ ide_init_sgiioc4(ide_hwif_t * hwif) | |||
612 | hwif->ide_dma_end = &sgiioc4_ide_dma_end; | 608 | hwif->ide_dma_end = &sgiioc4_ide_dma_end; |
613 | hwif->ide_dma_check = &sgiioc4_ide_dma_check; | 609 | hwif->ide_dma_check = &sgiioc4_ide_dma_check; |
614 | hwif->ide_dma_on = &sgiioc4_ide_dma_on; | 610 | hwif->ide_dma_on = &sgiioc4_ide_dma_on; |
615 | hwif->ide_dma_off_quietly = &sgiioc4_ide_dma_off_quietly; | 611 | hwif->dma_off_quietly = &sgiioc4_dma_off_quietly; |
616 | hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq; | 612 | hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq; |
617 | hwif->ide_dma_host_on = &sgiioc4_ide_dma_host_on; | 613 | hwif->ide_dma_host_on = &sgiioc4_ide_dma_host_on; |
618 | hwif->ide_dma_host_off = &sgiioc4_ide_dma_host_off; | 614 | hwif->dma_host_off = &sgiioc4_dma_host_off; |
619 | hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq; | 615 | hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq; |
620 | hwif->ide_dma_timeout = &__ide_dma_timeout; | 616 | hwif->ide_dma_timeout = &__ide_dma_timeout; |
621 | 617 | ||