From b298378ed2d5757319b2bfa5815182376165b6a5 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 8 Jul 2011 14:02:21 +0100
Subject: [PATCH] --- yaml --- r: 258175 b: refs/heads/master c:
 3973c337759cd201773a0ecc7b6f39f1ea2a6287 h: refs/heads/master i:   258173:
 92d15b33c534ba421030b60a7cb247e70dc91191   258171:
 e9d8f18917ab5988f29d4167c8e9aefbbee8df77   258167:
 18bf96f58be89ca424fcc08b09f872d4b3306311   258159:
 4a87c5b1f4773364039c51cca84adad701ca3d44   258143:
 28b4e8a731b359af60e6fc206090f519f4bcc54b   258111:
 c576178eafe453ed3fde40ab2cc9ec4f5e5566a5   258047:
 cc12fc21ea0e9e4af159d57a9799e312f230a2ee v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/include/asm/dma-mapping.h | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 46658eb3370e..805ac46a471b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c8598fca1a359520623ed5409d23bb9e23d7da3
+refs/heads/master: 3973c337759cd201773a0ecc7b6f39f1ea2a6287
diff --git a/trunk/arch/arm/include/asm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h
index 4ad25337f927..94662f4c9ea7 100644
--- a/trunk/arch/arm/include/asm/dma-mapping.h
+++ b/trunk/arch/arm/include/asm/dma-mapping.h
@@ -133,18 +133,12 @@ static inline int dma_supported(struct device *dev, u64 mask)
 
 static inline int dma_set_mask(struct device *dev, u64 dma_mask)
 {
-#ifdef CONFIG_DMABOUNCE
-	if (dev->archdata.dmabounce) {
-		if (dma_mask >= ISA_DMA_THRESHOLD)
-			return 0;
-		else
-			return -EIO;
-	}
-#endif
 	if (!dev->dma_mask || !dma_supported(dev, dma_mask))
 		return -EIO;
 
+#ifndef CONFIG_DMABOUNCE
 	*dev->dma_mask = dma_mask;
+#endif
 
 	return 0;
 }