aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
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
commit284901a90a9e0b812ca3f5f852cbbfb60d10249d (patch)
tree06c1b5a0f83c90cfb662f756e7781977ce739ce8 /drivers/infiniband
parent6afd142fd0dfba497246d0fab236c20a7b4bf778 (diff)
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>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/hw/amso1100/c2.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_driver.c4
-rw-r--r--drivers/infiniband/hw/mthca/mthca_main.c4
-rw-r--r--drivers/infiniband/hw/nes/nes.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index 54d2e0760ab..0cfbb6d2f76 100644
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -995,7 +995,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev,
995 goto bail2; 995 goto bail2;
996 } 996 }
997 } else { 997 } else {
998 ret = pci_set_dma_mask(pcidev, DMA_32BIT_MASK); 998 ret = pci_set_dma_mask(pcidev, DMA_BIT_MASK(32));
999 if (ret < 0) { 999 if (ret < 0) {
1000 printk(KERN_ERR PFX "32b DMA configuration failed\n"); 1000 printk(KERN_ERR PFX "32b DMA configuration failed\n");
1001 goto bail2; 1001 goto bail2;
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 77b2fb5b7c3..04e88b60055 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -477,7 +477,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
477 * do not setup 64 bit maps on systems with 2GB or less 477 * do not setup 64 bit maps on systems with 2GB or less
478 * memory installed. 478 * memory installed.
479 */ 479 */
480 ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 480 ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
481 if (ret) { 481 if (ret) {
482 dev_info(&pdev->dev, 482 dev_info(&pdev->dev,
483 "Unable to set DMA mask for unit %u: %d\n", 483 "Unable to set DMA mask for unit %u: %d\n",
@@ -486,7 +486,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
486 } 486 }
487 else { 487 else {
488 ipath_dbg("No 64bit DMA mask, used 32 bit mask\n"); 488 ipath_dbg("No 64bit DMA mask, used 32 bit mask\n");
489 ret = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 489 ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
490 if (ret) 490 if (ret)
491 dev_info(&pdev->dev, 491 dev_info(&pdev->dev,
492 "Unable to set DMA consistent mask " 492 "Unable to set DMA consistent mask "
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 5d234204f7b..1d83cf7caf3 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -1019,7 +1019,7 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
1019 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); 1019 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
1020 if (err) { 1020 if (err) {
1021 dev_warn(&pdev->dev, "Warning: couldn't set 64-bit PCI DMA mask.\n"); 1021 dev_warn(&pdev->dev, "Warning: couldn't set 64-bit PCI DMA mask.\n");
1022 err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 1022 err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
1023 if (err) { 1023 if (err) {
1024 dev_err(&pdev->dev, "Can't set PCI DMA mask, aborting.\n"); 1024 dev_err(&pdev->dev, "Can't set PCI DMA mask, aborting.\n");
1025 goto err_free_res; 1025 goto err_free_res;
@@ -1029,7 +1029,7 @@ static int __mthca_init_one(struct pci_dev *pdev, int hca_type)
1029 if (err) { 1029 if (err) {
1030 dev_warn(&pdev->dev, "Warning: couldn't set 64-bit " 1030 dev_warn(&pdev->dev, "Warning: couldn't set 64-bit "
1031 "consistent PCI DMA mask.\n"); 1031 "consistent PCI DMA mask.\n");
1032 err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 1032 err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
1033 if (err) { 1033 if (err) {
1034 dev_err(&pdev->dev, "Can't set consistent PCI DMA mask, " 1034 dev_err(&pdev->dev, "Can't set consistent PCI DMA mask, "
1035 "aborting.\n"); 1035 "aborting.\n");
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index 7446810446e..cbde0cfe27e 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -489,12 +489,12 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
489 goto bail2; 489 goto bail2;
490 } 490 }
491 } else { 491 } else {
492 ret = pci_set_dma_mask(pcidev, DMA_32BIT_MASK); 492 ret = pci_set_dma_mask(pcidev, DMA_BIT_MASK(32));
493 if (ret < 0) { 493 if (ret < 0) {
494 printk(KERN_ERR PFX "32b DMA mask configuration failed\n"); 494 printk(KERN_ERR PFX "32b DMA mask configuration failed\n");
495 goto bail2; 495 goto bail2;
496 } 496 }
497 ret = pci_set_consistent_dma_mask(pcidev, DMA_32BIT_MASK); 497 ret = pci_set_consistent_dma_mask(pcidev, DMA_BIT_MASK(32));
498 if (ret) { 498 if (ret) {
499 printk(KERN_ERR PFX "32b DMA consistent mask configuration failed\n"); 499 printk(KERN_ERR PFX "32b DMA consistent mask configuration failed\n");
500 goto bail2; 500 goto bail2;