From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 2 Mar 2007 11:42:11 +0000 (+0000)
Subject: [MIPS] dma_sync_sg_for_cpu is a no-op except for non-coherent R10000s.
X-Git-Tag: v2.6.21-rc3~103^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5b648a98db05fd0152349a11a7f7e30b80643977;p=linux-2.6-omap-h63xx.git

[MIPS] dma_sync_sg_for_cpu is a no-op except for non-coherent R10000s.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index a72093ad105..f503d02e403 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -295,7 +295,7 @@ void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
 
 	/* Make sure that gcc doesn't leave the empty loop body.  */
 	for (i = 0; i < nelems; i++, sg++) {
-		if (!plat_device_is_coherent(dev))
+		if (cpu_is_noncoherent_r10000(dev))
 			__dma_sync((unsigned long)page_address(sg->page),
 			           sg->length, direction);
 		plat_unmap_dma_mem(sg->dma_address);