4 files changed, 7 insertions, 7 deletions

diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index 7d79aa361e26..54d2e0760abf 100644
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -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;
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index cb9daa6ac029..77b2fb5b7c35 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -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 "
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 52f60f4eea00..5d234204f7b7 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -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");
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index ca599767ffbd..7446810446e1 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -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;