diff options
Diffstat (limited to 'arch/arm/include/asm')
-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) | |||
133 | 133 | ||
134 | static inline int dma_set_mask(struct device *dev, u64 dma_mask) | 134 | static inline int dma_set_mask(struct device *dev, u64 dma_mask) |
135 | { | 135 | { |
136 | #ifdef CONFIG_DMABOUNCE | ||
137 | if (dev->archdata.dmabounce) { | ||
138 | if (dma_mask >= ISA_DMA_THRESHOLD) | ||
139 | return 0; | ||
140 | else | ||
141 | return -EIO; | ||
142 | } | ||
143 | #endif | ||
144 | if (!dev->dma_mask || !dma_supported(dev, dma_mask)) | 136 | if (!dev->dma_mask || !dma_supported(dev, dma_mask)) |
145 | return -EIO; | 137 | return -EIO; |
146 | 138 | ||
139 | #ifndef CONFIG_DMABOUNCE | ||
147 | *dev->dma_mask = dma_mask; | 140 | *dev->dma_mask = dma_mask; |
141 | #endif | ||
148 | 142 | ||
149 | return 0; | 143 | return 0; |
150 | } | 144 | } |