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>
This commit is contained in:

committed by
Linus Torvalds

parent
8a59f5d252
commit
6a35528a83
@@ -989,7 +989,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
|
||||
}
|
||||
|
||||
if ((sizeof(dma_addr_t) > 4)) {
|
||||
ret = pci_set_dma_mask(pcidev, DMA_64BIT_MASK);
|
||||
ret = pci_set_dma_mask(pcidev, DMA_BIT_MASK(64));
|
||||
if (ret < 0) {
|
||||
printk(KERN_ERR PFX "64b DMA configuration failed\n");
|
||||
goto bail2;
|
||||
|
@@ -470,7 +470,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
|
||||
goto bail_disable;
|
||||
}
|
||||
|
||||
ret = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
|
||||
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
|
||||
if (ret) {
|
||||
/*
|
||||
* if the 64 bit setup fails, try 32 bit. Some systems
|
||||
@@ -496,7 +496,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
|
||||
}
|
||||
}
|
||||
else {
|
||||
ret = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
|
||||
ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
|
||||
if (ret)
|
||||
dev_info(&pdev->dev,
|
||||
"Unable to set DMA consistent mask "
|
||||
|
@@ -1016,7 +1016,7 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
|
||||
|
||||
pci_set_master(pdev);
|
||||
|
||||
err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
|
||||
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
|
||||
if (err) {
|
||||
dev_warn(&pdev->dev, "Warning: couldn't set 64-bit PCI DMA mask.\n");
|
||||
err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
|
||||
@@ -1025,7 +1025,7 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
|
||||
goto err_free_res;
|
||||
}
|
||||
}
|
||||
err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
|
||||
err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
|
||||
if (err) {
|
||||
dev_warn(&pdev->dev, "Warning: couldn't set 64-bit "
|
||||
"consistent PCI DMA mask.\n");
|
||||
|
@@ -478,12 +478,12 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
|
||||
}
|
||||
|
||||
if ((sizeof(dma_addr_t) > 4)) {
|
||||
ret = pci_set_dma_mask(pcidev, DMA_64BIT_MASK);
|
||||
ret = pci_set_dma_mask(pcidev, DMA_BIT_MASK(64));
|
||||
if (ret < 0) {
|
||||
printk(KERN_ERR PFX "64b DMA mask configuration failed\n");
|
||||
goto bail2;
|
||||
}
|
||||
ret = pci_set_consistent_dma_mask(pcidev, DMA_64BIT_MASK);
|
||||
ret = pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(64));
|
||||
if (ret) {
|
||||
printk(KERN_ERR PFX "64b DMA consistent mask configuration failed\n");
|
||||
goto bail2;
|
||||
|
Reference in New Issue
Block a user