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>

4 files changed, 6 insertions, 6 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index f6a337c34ac4..5496865b297e 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -1372,8 +1372,8 @@ static bool DAC960_V2_EnableMemoryMailboxInterface(DAC960_Controller_T
   dma_addr_t    CommandMailboxDMA;
   DAC960_V2_CommandStatus_T CommandStatus;
 
-        if (!pci_set_dma_mask(Controller->PCIDevice, DMA_64BIT_MASK))
-                Controller->BounceBufferLimit = DMA_64BIT_MASK;
+        if (!pci_set_dma_mask(Controller->PCIDevice, DMA_BIT_MASK(64)))
+                Controller->BounceBufferLimit = DMA_BIT_MASK(64);
         else if (!pci_set_dma_mask(Controller->PCIDevice, DMA_32BIT_MASK))
                 Controller->BounceBufferLimit = DMA_32BIT_MASK;
         else
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 5d0e135824f9..149a611e8fe5 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3637,7 +3637,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
         hba[i]->pdev = pdev;
 
         /* configure PCI DMA stuff */
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK))
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))
                 dac = 1;
         else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK))
                 dac = 0;
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index a18e1ca0f761..db5783ace1e4 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1586,9 +1586,9 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out;
 
 #ifdef IF_64BIT_DMA_IS_POSSIBLE /* grrrr... */
-        rc = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+        rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
         if (!rc) {
-                rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
                 if (rc) {
                         printk(KERN_ERR DRV_NAME "(%s): consistent DMA mask failure\n",
                                 pci_name(pdev));
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index c24e1bdbad43..e93e99c9103c 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -829,7 +829,7 @@ static int __devinit mm_pci_probe(struct pci_dev *dev,
         dev_printk(KERN_INFO, &dev->dev,
           "Micro Memory(tm) controller found (PCI Mem Module (Battery Backup))\n");
 
-        if (pci_set_dma_mask(dev, DMA_64BIT_MASK) &&
+        if (pci_set_dma_mask(dev, DMA_BIT_MASK(64)) &&
             pci_set_dma_mask(dev, DMA_32BIT_MASK)) {
                 dev_printk(KERN_WARNING, &dev->dev, "NO suitable DMA found\n");
                 return  -ENOMEM;