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>
This commit is contained in:
@@ -437,8 +437,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
|
||||
hwif->dma_exec_cmd = tmp_hwif->dma_exec_cmd;
|
||||
hwif->dma_start = tmp_hwif->dma_start;
|
||||
hwif->ide_dma_end = tmp_hwif->ide_dma_end;
|
||||
hwif->ide_dma_on = tmp_hwif->ide_dma_on;
|
||||
hwif->dma_off_quietly = tmp_hwif->dma_off_quietly;
|
||||
hwif->ide_dma_test_irq = tmp_hwif->ide_dma_test_irq;
|
||||
hwif->ide_dma_clear_irq = tmp_hwif->ide_dma_clear_irq;
|
||||
hwif->dma_host_on = tmp_hwif->dma_host_on;
|
||||
@@ -836,7 +834,7 @@ int set_using_dma(ide_drive_t *drive, int arg)
|
||||
if (!drive->id || !(drive->id->capability & 1))
|
||||
goto out;
|
||||
|
||||
if (hwif->ide_dma_on == NULL)
|
||||
if (hwif->dma_host_on == NULL)
|
||||
goto out;
|
||||
|
||||
err = -EBUSY;
|
||||
|
Reference in New Issue
Block a user