diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:11 -0400 |
commit | 284901a90a9e0b812ca3f5f852cbbfb60d10249d (patch) | |
tree | 06c1b5a0f83c90cfb662f756e7781977ce739ce8 /arch/powerpc/platforms | |
parent | 6afd142fd0dfba497246d0fab236c20a7b4bf778 (diff) |
dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/iseries/iommu.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/ps3/system-bus.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c index 6ed75bffc8a..ff43f1fd834 100644 --- a/arch/powerpc/platforms/iseries/iommu.c +++ b/arch/powerpc/platforms/iseries/iommu.c | |||
@@ -202,7 +202,7 @@ static struct iommu_table vio_iommu_table; | |||
202 | void *iseries_hv_alloc(size_t size, dma_addr_t *dma_handle, gfp_t flag) | 202 | void *iseries_hv_alloc(size_t size, dma_addr_t *dma_handle, gfp_t flag) |
203 | { | 203 | { |
204 | return iommu_alloc_coherent(NULL, &vio_iommu_table, size, dma_handle, | 204 | return iommu_alloc_coherent(NULL, &vio_iommu_table, size, dma_handle, |
205 | DMA_32BIT_MASK, flag, -1); | 205 | DMA_BIT_MASK(32), flag, -1); |
206 | } | 206 | } |
207 | EXPORT_SYMBOL_GPL(iseries_hv_alloc); | 207 | EXPORT_SYMBOL_GPL(iseries_hv_alloc); |
208 | 208 | ||
@@ -217,7 +217,7 @@ dma_addr_t iseries_hv_map(void *vaddr, size_t size, | |||
217 | { | 217 | { |
218 | return iommu_map_page(NULL, &vio_iommu_table, virt_to_page(vaddr), | 218 | return iommu_map_page(NULL, &vio_iommu_table, virt_to_page(vaddr), |
219 | (unsigned long)vaddr % PAGE_SIZE, size, | 219 | (unsigned long)vaddr % PAGE_SIZE, size, |
220 | DMA_32BIT_MASK, direction, NULL); | 220 | DMA_BIT_MASK(32), direction, NULL); |
221 | } | 221 | } |
222 | 222 | ||
223 | void iseries_hv_unmap(dma_addr_t dma_handle, size_t size, | 223 | void iseries_hv_unmap(dma_addr_t dma_handle, size_t size, |
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c index a705fffbb49..9a73d023863 100644 --- a/arch/powerpc/platforms/ps3/system-bus.c +++ b/arch/powerpc/platforms/ps3/system-bus.c | |||
@@ -689,7 +689,7 @@ static void ps3_ioc0_unmap_sg(struct device *_dev, struct scatterlist *sg, | |||
689 | 689 | ||
690 | static int ps3_dma_supported(struct device *_dev, u64 mask) | 690 | static int ps3_dma_supported(struct device *_dev, u64 mask) |
691 | { | 691 | { |
692 | return mask >= DMA_32BIT_MASK; | 692 | return mask >= DMA_BIT_MASK(32); |
693 | } | 693 | } |
694 | 694 | ||
695 | static struct dma_mapping_ops ps3_sb_dma_ops = { | 695 | static struct dma_mapping_ops ps3_sb_dma_ops = { |