diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 21:39:45 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-13 21:39:45 +0200 |
| commit | f5e0b5ecb3afc8050259003067b6a1aef3635f12 (patch) | |
| tree | 844d99a5478061268c383e2fcf1b952c96b07ed2 /drivers | |
| parent | 9055ba3ee2dba801e8e6bddec9003ad8bca153ab (diff) | |
| download | linux-3.10-f5e0b5ecb3afc8050259003067b6a1aef3635f12.tar.gz linux-3.10-f5e0b5ecb3afc8050259003067b6a1aef3635f12.tar.bz2 linux-3.10-f5e0b5ecb3afc8050259003067b6a1aef3635f12.zip | |
pmac: remove needless pmac_ide_destroy_dmatable() wrapper
hwif->sg_nents is always != 0 when this function is called
and there is also no need to explicitely zero hwif->sg_nents.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/ppc/pmac.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 7f2ce6195d1..2e19d629853 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c @@ -1523,18 +1523,6 @@ use_pio_instead: return 0; /* revert to PIO for this request */ } -/* Teardown mappings after DMA has completed. */ -static void -pmac_ide_destroy_dmatable (ide_drive_t *drive) -{ - ide_hwif_t *hwif = drive->hwif; - - if (hwif->sg_nents) { - ide_destroy_dmatable(drive); - hwif->sg_nents = 0; - } -} - /* * Prepare a DMA transfer. We build the DMA table, adjust the timings for * a read on KeyLargo ATA/66 and mark us as waiting for DMA completion @@ -1606,7 +1594,9 @@ pmac_ide_dma_end (ide_drive_t *drive) drive->waiting_for_dma = 0; dstat = readl(&dma->status); writel(((RUN|WAKE|DEAD) << 16), &dma->control); - pmac_ide_destroy_dmatable(drive); + + ide_destroy_dmatable(drive); + /* verify good dma status. we don't check for ACTIVE beeing 0. We should... * in theory, but with ATAPI decices doing buffer underruns, that would * cause us to disable DMA, which isn't what we want |