From 8fec4cec01dad7cca4bf67bdd3cef993d6a007ff Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Mon, 13 Oct 2008 21:39:45 +0200 Subject: [PATCH] --- yaml --- r: 114209 b: refs/heads/master c: f5e0b5ecb3afc8050259003067b6a1aef3635f12 h: refs/heads/master i: 114207: a08a7cc5321a9c28a89d9bd11b0680862fc13aee v: v3 --- [refs] | 2 +- trunk/drivers/ide/ppc/pmac.c | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index c375d6a96391..c0c62ed6c948 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9055ba3ee2dba801e8e6bddec9003ad8bca153ab +refs/heads/master: f5e0b5ecb3afc8050259003067b6a1aef3635f12 diff --git a/trunk/drivers/ide/ppc/pmac.c b/trunk/drivers/ide/ppc/pmac.c index 7f2ce6195d1e..2e19d6298536 100644 --- a/trunk/drivers/ide/ppc/pmac.c +++ b/trunk/drivers/ide/ppc/pmac.c @@ -1523,18 +1523,6 @@ pmac_ide_build_dmatable(ide_drive_t *drive, struct request *rq) 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