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>

3 files changed, 5 insertions, 5 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index ea3aafbbda4..98026016a93 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1534,8 +1534,8 @@ mpt_mapresources(MPT_ADAPTER *ioc)
 
         pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
 
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)
-            && !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))
+            && !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 dinitprintk(ioc, printk(MYIOC_s_INFO_FMT
                     ": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n",
                     ioc->name));
diff --git a/drivers/message/i2o/memory.c b/drivers/message/i2o/memory.c
index f5cc95c564e..9a08d8e4551 100644
--- a/drivers/message/i2o/memory.c
+++ b/drivers/message/i2o/memory.c
@@ -185,7 +185,7 @@ int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, size_t len)
         int dma_64 = 0;
 
         mutex_lock(&mem_lock);
-        if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_64BIT_MASK)) {
+        if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_BIT_MASK(64))) {
                 dma_64 = 1;
                 if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                         mutex_unlock(&mem_lock);
@@ -196,7 +196,7 @@ int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr, size_t len)
         addr->virt = dma_alloc_coherent(dev, len, &addr->phys, GFP_KERNEL);
 
         if ((sizeof(dma_addr_t) > 4) && dma_64)
-                if (pci_set_dma_mask(pdev, DMA_64BIT_MASK))
+                if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))
                         printk(KERN_WARNING "i2o: unable to set 64-bit DMA");
         mutex_unlock(&mem_lock);
 
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 25d6f234198..ed17ac5af3e 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -397,7 +397,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
                 }
 #ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64
                 if (sizeof(dma_addr_t) > 4) {
-                        if (pci_set_dma_mask(pdev, DMA_64BIT_MASK))
+                        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))
                                 printk(KERN_INFO "%s: 64-bit DMA unavailable\n",
                                        c->name);
                         else {