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>

3 files changed, 8 insertions, 8 deletions

diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index e83ef8aaa98c..280261c451d6 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1407,8 +1407,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
                         if (!dev->in_reset)
                                 printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
                                         dev->name, dev->id);
-                } else if (!pci_set_dma_mask(dev->pdev, DMA_32BIT_MASK) &&
-                        !pci_set_consistent_dma_mask(dev->pdev, DMA_32BIT_MASK)) {
+                } else if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(32)) &&
+                        !pci_set_consistent_dma_mask(dev->pdev, DMA_BIT_MASK(32))) {
                         printk(KERN_INFO"%s%d: DMA mask set failed, 64 Bit DAC disabled\n",
                                 dev->name, dev->id);
                         dev->dac_support = 0;
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index d24c2670040b..3b69c2d98dd6 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1210,14 +1210,14 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced)
                   ((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_31BIT_MASK))))
                         goto out;
         } else {
-                if (((retval = pci_set_dma_mask(aac->pdev, DMA_32BIT_MASK))) ||
-                  ((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_32BIT_MASK))))
+                if (((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(32)))) ||
+                  ((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_BIT_MASK(32)))))
                         goto out;
         }
         if ((retval = (*(aac_get_driver_ident(index)->init))(aac)))
                 goto out;
         if (quirks & AAC_QUIRK_31BIT)
-                if ((retval = pci_set_dma_mask(aac->pdev, DMA_32BIT_MASK)))
+                if ((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(32))))
                         goto out;
         if (jafo) {
                 aac->thread = kthread_run(aac_command_thread, aac, aac->name);
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index c507719c0d44..3c3ed4b3311a 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1095,8 +1095,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
                 goto out;
         error = -ENODEV;
 
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) ||
-                        pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) ||
+                        pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)))
                 goto out_disable_pdev;
         /*
          * If the quirk31 bit is set, the adapter needs adapter
@@ -1154,7 +1154,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
          * address space.
          */
         if (aac_drivers[index].quirks & AAC_QUIRK_31BIT)
-                if (pci_set_dma_mask(pdev, DMA_32BIT_MASK))
+                if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))
                         goto out_deinit;
 
         aac->maximum_num_channels = aac_drivers[index].channels;