adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

dma-mapping: replace all DMA_39BIT_MASK macro with DMA_BIT_MASK(39)

Browse source 
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>
This commit is contained in:
Yang Hongyang 2009-04-06 19:01:15 -07:00 committed by Linus Torvalds
parent 50cf156af7
commit 6afd142fd0
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/forcedeth.c
View file

@ -5632,12 +5632,12 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
np->desc_ver = DESC_VER_3; np->desc_ver = DESC_VER_3;
np->txrxctl_bits = NVREG_TXRXCTL_DESC_3; np->txrxctl_bits = NVREG_TXRXCTL_DESC_3;
if (dma_64bit) { if (dma_64bit) {
if (pci_set_dma_mask(pci_dev, DMA_39BIT_MASK)) if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(39)))
dev_printk(KERN_INFO, &pci_dev->dev, dev_printk(KERN_INFO, &pci_dev->dev,
"64-bit DMA failed, using 32-bit addressing\n"); "64-bit DMA failed, using 32-bit addressing\n");
else else
dev->features |= NETIF_F_HIGHDMA; dev->features |= NETIF_F_HIGHDMA;
if (pci_set_consistent_dma_mask(pci_dev, DMA_39BIT_MASK)) { if (pci_set_consistent_dma_mask(pci_dev, DMA_BIT_MASK(39))) {
dev_printk(KERN_INFO, &pci_dev->dev, dev_printk(KERN_INFO, &pci_dev->dev,
"64-bit DMA (consistent) failed, using 32-bit ring buffers\n"); "64-bit DMA (consistent) failed, using 32-bit ring buffers\n");
} }

8
drivers/net/netxen/netxen_nic_main.c
View file

@ -207,19 +207,19 @@ static int nx_set_dma_mask(struct netxen_adapter *adapter, uint8_t revision_id)
adapter->pci_using_dac = 0; adapter->pci_using_dac = 0;
mask = DMA_32BIT_MASK; mask = DMA_BIT_MASK(32);
/* /*
* Consistent DMA mask is set to 32 bit because it cannot be set to * Consistent DMA mask is set to 32 bit because it cannot be set to
* 35 bits. For P3 also leave it at 32 bits for now. Only the rings * 35 bits. For P3 also leave it at 32 bits for now. Only the rings
* come off this pool. * come off this pool.
*/ */
cmask = DMA_32BIT_MASK; cmask = DMA_BIT_MASK(32);
#ifndef CONFIG_IA64 #ifndef CONFIG_IA64
if (revision_id >= NX_P3_B0) if (revision_id >= NX_P3_B0)
mask = DMA_39BIT_MASK; mask = DMA_BIT_MASK(39);
else if (revision_id == NX_P2_C1) else if (revision_id == NX_P2_C1)
mask = DMA_35BIT_MASK; mask = DMA_BIT_MASK(35);
#endif #endif
if (pci_set_dma_mask(pdev, mask) == 0 && if (pci_set_dma_mask(pdev, mask) == 0 &&
pci_set_consistent_dma_mask(pdev, cmask) == 0) { pci_set_consistent_dma_mask(pdev, cmask) == 0) {

4
drivers/scsi/aic7xxx/aic79xx_osm_pci.c
View file

@ -194,11 +194,11 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (sizeof(dma_addr_t) > 4) { if (sizeof(dma_addr_t) > 4) {
const u64 required_mask = dma_get_required_mask(dev); const u64 required_mask = dma_get_required_mask(dev);
if (required_mask > DMA_39BIT_MASK && if (required_mask > DMA_BIT_MASK(39) &&
dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) dma_set_mask(dev, DMA_BIT_MASK(64)) == 0)
ahd->flags |= AHD_64BIT_ADDRESSING; ahd->flags |= AHD_64BIT_ADDRESSING;
else if (required_mask > DMA_32BIT_MASK && else if (required_mask > DMA_32BIT_MASK &&
dma_set_mask(dev, DMA_39BIT_MASK) == 0) dma_set_mask(dev, DMA_BIT_MASK(39)) == 0)
ahd->flags |= AHD_39BIT_ADDRESSING; ahd->flags |= AHD_39BIT_ADDRESSING;
else else
dma_set_mask(dev, DMA_32BIT_MASK); dma_set_mask(dev, DMA_32BIT_MASK);