aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorYang Hongyang <yanghy@cn.fujitsu.com>2009-04-06 22:01:17 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 11:31:11 -0400
commit28b767967763835d8526f6baedc25a8a86052640 (patch)
tree32dc0df187bd1906bf49f47ecbdda60d21b5c124 /drivers/net/wireless
parent929a22a558429bd22001d6b41cf31c233c68a5e2 (diff)
dma-mapping: replace all DMA_30BIT_MASK macro with DMA_BIT_MASK(30)
Replace all DMA_30BIT_MASK macro with DMA_BIT_MASK(30) 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')
-rw-r--r--drivers/net/wireless/b43/dma.c6
-rw-r--r--drivers/net/wireless/b43legacy/dma.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index de1964f7d9e0..e228c1de6e11 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -779,12 +779,12 @@ static u64 supported_dma_mask(struct b43_wldev *dev)
779 if (tmp & B43_DMA32_TXADDREXT_MASK) 779 if (tmp & B43_DMA32_TXADDREXT_MASK)
780 return DMA_BIT_MASK(32); 780 return DMA_BIT_MASK(32);
781 781
782 return DMA_30BIT_MASK; 782 return DMA_BIT_MASK(30);
783} 783}
784 784
785static enum b43_dmatype dma_mask_to_engine_type(u64 dmamask) 785static enum b43_dmatype dma_mask_to_engine_type(u64 dmamask)
786{ 786{
787 if (dmamask == DMA_30BIT_MASK) 787 if (dmamask == DMA_BIT_MASK(30))
788 return B43_DMA_30BIT; 788 return B43_DMA_30BIT;
789 if (dmamask == DMA_BIT_MASK(32)) 789 if (dmamask == DMA_BIT_MASK(32))
790 return B43_DMA_32BIT; 790 return B43_DMA_32BIT;
@@ -1005,7 +1005,7 @@ static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask)
1005 continue; 1005 continue;
1006 } 1006 }
1007 if (mask == DMA_BIT_MASK(32)) { 1007 if (mask == DMA_BIT_MASK(32)) {
1008 mask = DMA_30BIT_MASK; 1008 mask = DMA_BIT_MASK(30);
1009 fallback = 1; 1009 fallback = 1;
1010 continue; 1010 continue;
1011 } 1011 }
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index 1d3e0d239314..2f90fb9f5367 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -856,12 +856,12 @@ static u64 supported_dma_mask(struct b43legacy_wldev *dev)
856 if (tmp & B43legacy_DMA32_TXADDREXT_MASK) 856 if (tmp & B43legacy_DMA32_TXADDREXT_MASK)
857 return DMA_BIT_MASK(32); 857 return DMA_BIT_MASK(32);
858 858
859 return DMA_30BIT_MASK; 859 return DMA_BIT_MASK(30);
860} 860}
861 861
862static enum b43legacy_dmatype dma_mask_to_engine_type(u64 dmamask) 862static enum b43legacy_dmatype dma_mask_to_engine_type(u64 dmamask)
863{ 863{
864 if (dmamask == DMA_30BIT_MASK) 864 if (dmamask == DMA_BIT_MASK(30))
865 return B43legacy_DMA_30BIT; 865 return B43legacy_DMA_30BIT;
866 if (dmamask == DMA_BIT_MASK(32)) 866 if (dmamask == DMA_BIT_MASK(32))
867 return B43legacy_DMA_32BIT; 867 return B43legacy_DMA_32BIT;
@@ -1048,7 +1048,7 @@ static int b43legacy_dma_set_mask(struct b43legacy_wldev *dev, u64 mask)
1048 continue; 1048 continue;
1049 } 1049 }
1050 if (mask == DMA_BIT_MASK(32)) { 1050 if (mask == DMA_BIT_MASK(32)) {
1051 mask = DMA_30BIT_MASK; 1051 mask = DMA_BIT_MASK(30);
1052 fallback = 1; 1052 fallback = 1;
1053 continue; 1053 continue;
1054 } 1054 }