diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-08 14:02:21 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-08 14:02:21 +0100 |
| commit | 3973c337759cd201773a0ecc7b6f39f1ea2a6287 (patch) | |
| tree | 5b2be9f17a2224f4d3c4d61c10657d4fd3e8d7f1 | |
| parent | 5c8598fca1a359520623ed5409d23bb9e23d7da3 (diff) | |
| download | lwn-3973c337759cd201773a0ecc7b6f39f1ea2a6287.tar.gz lwn-3973c337759cd201773a0ecc7b6f39f1ea2a6287.zip | |
ARM: dmabounce: simplify dma_set_mask()
Simplify the dmabounce specific code in dma_set_mask(). We can just
omit setting the dma mask if dmabounce is enabled (we will have already
set dma mask via callbacks when the device is created in that case.)
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 4ad25337f927..94662f4c9ea7 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/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; } |