aboutsummaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--drivers/net/forcedeth.c4
-rw-r--r--drivers/net/netxen/netxen_nic_main.c8
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_osm_pci.c4
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 663a7b3261ee..d37465020bcc 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5632,12 +5632,12 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
5632 np->desc_ver = DESC_VER_3; 5632 np->desc_ver = DESC_VER_3;
5633 np->txrxctl_bits = NVREG_TXRXCTL_DESC_3; 5633 np->txrxctl_bits = NVREG_TXRXCTL_DESC_3;
5634 if (dma_64bit) { 5634 if (dma_64bit) {
5635 if (pci_set_dma_mask(pci_dev, DMA_39BIT_MASK)) 5635 if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(39)))
5636 dev_printk(KERN_INFO, &pci_dev->dev, 5636 dev_printk(KERN_INFO, &pci_dev->dev,
5637 "64-bit DMA failed, using 32-bit addressing\n"); 5637 "64-bit DMA failed, using 32-bit addressing\n");
5638 else 5638 else
5639 dev->features |= NETIF_F_HIGHDMA; 5639 dev->features |= NETIF_F_HIGHDMA;
5640 if (pci_set_consistent_dma_mask(pci_dev, DMA_39BIT_MASK)) { 5640 if (pci_set_consistent_dma_mask(pci_dev, DMA_BIT_MASK(39))) {
5641 dev_printk(KERN_INFO, &pci_dev->dev, 5641 dev_printk(KERN_INFO, &pci_dev->dev,
5642 "64-bit DMA (consistent) failed, using 32-bit ring buffers\n"); 5642 "64-bit DMA (consistent) failed, using 32-bit ring buffers\n");
5643 } 5643 }
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) {
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 032e2b120b32..c583d89f569a 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -194,11 +194,11 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
194 if (sizeof(dma_addr_t) > 4) { 194 if (sizeof(dma_addr_t) > 4) {
195 const u64 required_mask = dma_get_required_mask(dev); 195 const u64 required_mask = dma_get_required_mask(dev);
196 196
197 if (required_mask > DMA_39BIT_MASK && 197 if (required_mask > DMA_BIT_MASK(39) &&
198 dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) 198 dma_set_mask(dev, DMA_BIT_MASK(64)) == 0)
199 ahd->flags |= AHD_64BIT_ADDRESSING; 199 ahd->flags |= AHD_64BIT_ADDRESSING;
200 else if (required_mask > DMA_32BIT_MASK && 200 else if (required_mask > DMA_32BIT_MASK &&
201 dma_set_mask(dev, DMA_39BIT_MASK) == 0) 201 dma_set_mask(dev, DMA_BIT_MASK(39)) == 0)
202 ahd->flags |= AHD_39BIT_ADDRESSING; 202 ahd->flags |= AHD_39BIT_ADDRESSING;
203 else 203 else
204 dma_set_mask(dev, DMA_32BIT_MASK); 204 dma_set_mask(dev, DMA_32BIT_MASK);