diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 14:13:01 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 14:13:01 -0500 |
commit | 4a546e046d562bcd389149591fa5a534c8f832ca (patch) | |
tree | ffc5c7bd088a0bf74744721b9cfcf18220a75fdf /drivers/ide/pci/sgiioc4.c | |
parent | 378f577f7f75aa18a0eeafb044a491dcd5aeaa3d (diff) |
ide: remove ->ide_dma_on and ->dma_off_quietly methods from ide_hwif_t
* Make ide_dma_off_quietly() and __ide_dma_on() always available.
* Drop "__" prefix from __ide_dma_on().
* Check for presence of ->dma_host_on instead of ->ide_dma_on.
* Convert all users of ->ide_dma_on and ->dma_off_quietly methods
to use ide_dma_on() and ide_dma_off_quietly() instead.
* Remove no longer needed ->ide_dma_on and ->dma_off_quietly methods
from ide_hwif_t.
* Make ide_dma_on() void.
There should be no functionality changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/sgiioc4.c')
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 19 |
1 files changed, 0 insertions, 19 deletions
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; |