dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)
Replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32) 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
6afd142fd0
commit
284901a90a
@@ -995,7 +995,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
|
||||
goto bail2;
|
||||
}
|
||||
} else {
|
||||
ret = pci_set_dma_mask(pcidev, DMA_32BIT_MASK);
|
||||
ret = pci_set_dma_mask(pcidev, DMA_BIT_MASK(32));
|
||||
if (ret < 0) {
|
||||
printk(KERN_ERR PFX "32b DMA configuration failed\n");
|
||||
goto bail2;
|
||||
|
@@ -477,7 +477,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
|
||||
* do not setup 64 bit maps on systems with 2GB or less
|
||||
* memory installed.
|
||||
*/
|
||||
ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
|
||||
ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
|
||||
if (ret) {
|
||||
dev_info(&pdev->dev,
|
||||
"Unable to set DMA mask for unit %u: %d\n",
|
||||
@@ -486,7 +486,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
|
||||
}
|
||||
else {
|
||||
ipath_dbg("No 64bit DMA mask, used 32 bit mask\n");
|
||||
ret = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
|
||||
ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
||||
if (ret)
|
||||
dev_info(&pdev->dev,
|
||||
"Unable to set DMA consistent mask "
|
||||
|
@@ -1019,7 +1019,7 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
|
||||
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);
|
||||
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "Can't set PCI DMA mask, aborting.\n");
|
||||
goto err_free_res;
|
||||
@@ -1029,7 +1029,7 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
|
||||
if (err) {
|
||||
dev_warn(&pdev->dev, "Warning: couldn't set 64-bit "
|
||||
"consistent PCI DMA mask.\n");
|
||||
err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
|
||||
err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
||||
if (err) {
|
||||
dev_err(&pdev->dev, "Can't set consistent PCI DMA mask, "
|
||||
"aborting.\n");
|
||||
|
@@ -489,12 +489,12 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
|
||||
goto bail2;
|
||||
}
|
||||
} else {
|
||||
ret = pci_set_dma_mask(pcidev, DMA_32BIT_MASK);
|
||||
ret = pci_set_dma_mask(pcidev, DMA_BIT_MASK(32));
|
||||
if (ret < 0) {
|
||||
printk(KERN_ERR PFX "32b DMA mask configuration failed\n");
|
||||
goto bail2;
|
||||
}
|
||||
ret = pci_set_consistent_dma_mask(pcidev, DMA_32BIT_MASK);
|
||||
ret = pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(32));
|
||||
if (ret) {
|
||||
printk(KERN_ERR PFX "32b DMA consistent mask configuration failed\n");
|
||||
goto bail2;
|
||||
|
Reference in New Issue
Block a user