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/b43legacy | |
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/b43legacy')
-rw-r--r-- | drivers/net/wireless/b43legacy/dma.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c index 3649fc36709..61bb91266aa 100644 --- a/drivers/net/wireless/b43legacy/dma.c +++ b/drivers/net/wireless/b43legacy/dma.c | |||
@@ -846,7 +846,7 @@ static u64 supported_dma_mask(struct b43legacy_wldev *dev) | |||
846 | 846 | ||
847 | tmp = b43legacy_read32(dev, SSB_TMSHIGH); | 847 | tmp = b43legacy_read32(dev, SSB_TMSHIGH); |
848 | if (tmp & SSB_TMSHIGH_DMA64) | 848 | if (tmp & SSB_TMSHIGH_DMA64) |
849 | return DMA_64BIT_MASK; | 849 | return DMA_BIT_MASK(64); |
850 | mmio_base = b43legacy_dmacontroller_base(0, 0); | 850 | mmio_base = b43legacy_dmacontroller_base(0, 0); |
851 | b43legacy_write32(dev, | 851 | b43legacy_write32(dev, |
852 | mmio_base + B43legacy_DMA32_TXCTL, | 852 | mmio_base + B43legacy_DMA32_TXCTL, |
@@ -865,7 +865,7 @@ static enum b43legacy_dmatype dma_mask_to_engine_type(u64 dmamask) | |||
865 | return B43legacy_DMA_30BIT; | 865 | return B43legacy_DMA_30BIT; |
866 | if (dmamask == DMA_32BIT_MASK) | 866 | if (dmamask == DMA_32BIT_MASK) |
867 | return B43legacy_DMA_32BIT; | 867 | return B43legacy_DMA_32BIT; |
868 | if (dmamask == DMA_64BIT_MASK) | 868 | if (dmamask == DMA_BIT_MASK(64)) |
869 | return B43legacy_DMA_64BIT; | 869 | return B43legacy_DMA_64BIT; |
870 | B43legacy_WARN_ON(1); | 870 | B43legacy_WARN_ON(1); |
871 | return B43legacy_DMA_30BIT; | 871 | return B43legacy_DMA_30BIT; |
@@ -1042,7 +1042,7 @@ static int b43legacy_dma_set_mask(struct b43legacy_wldev *dev, u64 mask) | |||
1042 | err = ssb_dma_set_mask(dev->dev, mask); | 1042 | err = ssb_dma_set_mask(dev->dev, mask); |
1043 | if (!err) | 1043 | if (!err) |
1044 | break; | 1044 | break; |
1045 | if (mask == DMA_64BIT_MASK) { | 1045 | if (mask == DMA_BIT_MASK(64)) { |
1046 | mask = DMA_32BIT_MASK; | 1046 | mask = DMA_32BIT_MASK; |
1047 | fallback = 1; | 1047 | fallback = 1; |
1048 | continue; | 1048 | continue; |