---

yaml
---
r: 114209
b: refs/heads/master
c: f5e0b5e
h: refs/heads/master
i:
  114207: a08a7cc
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9055ba3ee2dba801e8e6bddec9003ad8bca153ab
+refs/heads/master: f5e0b5ecb3afc8050259003067b6a1aef3635f12

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