aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen
diff options
context:
space:
mode:
authorYang Hongyang <yanghy@cn.fujitsu.com>2009-04-06 22:01:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 11:31:11 -0400
commit6afd142fd0dfba497246d0fab236c20a7b4bf778 (patch)
treef45bf4da587d94acfa1aa1fd35b611d8828689bc /drivers/net/netxen
parent50cf156af7dc68a44409bef636585ef88ebbab34 (diff)
dma-mapping: replace all DMA_39BIT_MASK macro with DMA_BIT_MASK(39)
Replace all DMA_39BIT_MASK macro with DMA_BIT_MASK(39) 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/netxen')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 1af47257ba82..aef77289bd34 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -207,19 +207,19 @@ static int nx_set_dma_mask(struct netxen_adapter *adapter, uint8_t revision_id)
207 207
208 adapter->pci_using_dac = 0; 208 adapter->pci_using_dac = 0;
209 209
210 mask = DMA_32BIT_MASK; 210 mask = DMA_BIT_MASK(32);
211 /* 211 /*
212 * Consistent DMA mask is set to 32 bit because it cannot be set to 212 * Consistent DMA mask is set to 32 bit because it cannot be set to
213 * 35 bits. For P3 also leave it at 32 bits for now. Only the rings 213 * 35 bits. For P3 also leave it at 32 bits for now. Only the rings
214 * come off this pool. 214 * come off this pool.
215 */ 215 */
216 cmask = DMA_32BIT_MASK; 216 cmask = DMA_BIT_MASK(32);
217 217
218#ifndef CONFIG_IA64 218#ifndef CONFIG_IA64
219 if (revision_id >= NX_P3_B0) 219 if (revision_id >= NX_P3_B0)
220 mask = DMA_39BIT_MASK; 220 mask = DMA_BIT_MASK(39);
221 else if (revision_id == NX_P2_C1) 221 else if (revision_id == NX_P2_C1)
222 mask = DMA_35BIT_MASK; 222 mask = DMA_BIT_MASK(35);
223#endif 223#endif
224 if (pci_set_dma_mask(pdev, mask) == 0 && 224 if (pci_set_dma_mask(pdev, mask) == 0 &&
225 pci_set_consistent_dma_mask(pdev, cmask) == 0) { 225 pci_set_consistent_dma_mask(pdev, cmask) == 0) {