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 /drivers/net/wireless/b43/dma.c | |
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 'drivers/net/wireless/b43/dma.c')
-rw-r--r-- | drivers/net/wireless/b43/dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index 461d680d2ce..de1964f7d9e 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c | |||
@@ -777,7 +777,7 @@ static u64 supported_dma_mask(struct b43_wldev *dev) | |||
777 | b43_write32(dev, mmio_base + B43_DMA32_TXCTL, B43_DMA32_TXADDREXT_MASK); | 777 | b43_write32(dev, mmio_base + B43_DMA32_TXCTL, B43_DMA32_TXADDREXT_MASK); |
778 | tmp = b43_read32(dev, mmio_base + B43_DMA32_TXCTL); | 778 | tmp = b43_read32(dev, mmio_base + B43_DMA32_TXCTL); |
779 | if (tmp & B43_DMA32_TXADDREXT_MASK) | 779 | if (tmp & B43_DMA32_TXADDREXT_MASK) |
780 | return DMA_32BIT_MASK; | 780 | return DMA_BIT_MASK(32); |
781 | 781 | ||
782 | return DMA_30BIT_MASK; | 782 | return DMA_30BIT_MASK; |
783 | } | 783 | } |
@@ -786,7 +786,7 @@ static enum b43_dmatype dma_mask_to_engine_type(u64 dmamask) | |||
786 | { | 786 | { |
787 | if (dmamask == DMA_30BIT_MASK) | 787 | if (dmamask == DMA_30BIT_MASK) |
788 | return B43_DMA_30BIT; | 788 | return B43_DMA_30BIT; |
789 | if (dmamask == DMA_32BIT_MASK) | 789 | if (dmamask == DMA_BIT_MASK(32)) |
790 | return B43_DMA_32BIT; | 790 | return B43_DMA_32BIT; |
791 | if (dmamask == DMA_BIT_MASK(64)) | 791 | if (dmamask == DMA_BIT_MASK(64)) |
792 | return B43_DMA_64BIT; | 792 | return B43_DMA_64BIT; |
@@ -1000,11 +1000,11 @@ static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask) | |||
1000 | if (!err) | 1000 | if (!err) |
1001 | break; | 1001 | break; |
1002 | if (mask == DMA_BIT_MASK(64)) { | 1002 | if (mask == DMA_BIT_MASK(64)) { |
1003 | mask = DMA_32BIT_MASK; | 1003 | mask = DMA_BIT_MASK(32); |
1004 | fallback = 1; | 1004 | fallback = 1; |
1005 | continue; | 1005 | continue; |
1006 | } | 1006 | } |
1007 | if (mask == DMA_32BIT_MASK) { | 1007 | if (mask == DMA_BIT_MASK(32)) { |
1008 | mask = DMA_30BIT_MASK; | 1008 | mask = DMA_30BIT_MASK; |
1009 | fallback = 1; | 1009 | fallback = 1; |
1010 | continue; | 1010 | continue; |