diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:10 -0400 |
commit | 6a35528a8346f6e6fd32ed7e51f04d1fa4ca2c01 (patch) | |
tree | 9caaf8645b573687bbcf3a16b5aa7dd233fed46e /drivers/net/wireless/b43 | |
parent | 8a59f5d2526593c6bc1a0754c3a16ccc9ed41ce3 (diff) |
dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)
Replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)
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')
-rw-r--r-- | drivers/net/wireless/b43/dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index 0cc804d0a214..461d680d2cec 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c | |||
@@ -772,7 +772,7 @@ static u64 supported_dma_mask(struct b43_wldev *dev) | |||
772 | 772 | ||
773 | tmp = b43_read32(dev, SSB_TMSHIGH); | 773 | tmp = b43_read32(dev, SSB_TMSHIGH); |
774 | if (tmp & SSB_TMSHIGH_DMA64) | 774 | if (tmp & SSB_TMSHIGH_DMA64) |
775 | return DMA_64BIT_MASK; | 775 | return DMA_BIT_MASK(64); |
776 | mmio_base = b43_dmacontroller_base(0, 0); | 776 | mmio_base = b43_dmacontroller_base(0, 0); |
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); |
@@ -788,7 +788,7 @@ static enum b43_dmatype dma_mask_to_engine_type(u64 dmamask) | |||
788 | return B43_DMA_30BIT; | 788 | return B43_DMA_30BIT; |
789 | if (dmamask == DMA_32BIT_MASK) | 789 | if (dmamask == DMA_32BIT_MASK) |
790 | return B43_DMA_32BIT; | 790 | return B43_DMA_32BIT; |
791 | if (dmamask == DMA_64BIT_MASK) | 791 | if (dmamask == DMA_BIT_MASK(64)) |
792 | return B43_DMA_64BIT; | 792 | return B43_DMA_64BIT; |
793 | B43_WARN_ON(1); | 793 | B43_WARN_ON(1); |
794 | return B43_DMA_30BIT; | 794 | return B43_DMA_30BIT; |
@@ -999,7 +999,7 @@ static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask) | |||
999 | err = ssb_dma_set_mask(dev->dev, mask); | 999 | err = ssb_dma_set_mask(dev->dev, mask); |
1000 | if (!err) | 1000 | if (!err) |
1001 | break; | 1001 | break; |
1002 | if (mask == DMA_64BIT_MASK) { | 1002 | if (mask == DMA_BIT_MASK(64)) { |
1003 | mask = DMA_32BIT_MASK; | 1003 | mask = DMA_32BIT_MASK; |
1004 | fallback = 1; | 1004 | fallback = 1; |
1005 | continue; | 1005 | continue; |