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>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index b2c19449119d..234f0b7eb21c 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -473,7 +473,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         // Setup the default DMA mask. This would be changed later on
         // depending on hardware capabilities
-        if (pci_set_dma_mask(adapter->pdev, DMA_32BIT_MASK) != 0) {
+        if (pci_set_dma_mask(adapter->pdev, DMA_BIT_MASK(32)) != 0) {
 
                 con_log(CL_ANN, (KERN_WARNING
                         "megaraid: pci_set_dma_mask failed:%d\n", __LINE__));
@@ -904,7 +904,7 @@ megaraid_init_mbox(adapter_t *adapter)
                         con_log(CL_ANN, (KERN_WARNING
                                 "megaraid: DMA mask for 64-bit failed\n"));
 
-                        if (pci_set_dma_mask (adapter->pdev, DMA_32BIT_MASK)) {
+                        if (pci_set_dma_mask (adapter->pdev, DMA_BIT_MASK(32))) {
                                 con_log(CL_ANN, (KERN_WARNING
                                         "megaraid: 32-bit DMA mask failed\n"));
                                 goto out_free_sysfs_res;
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 713de85771f3..7dc3d1894b1a 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -2499,11 +2499,11 @@ megasas_set_dma_mask(struct pci_dev *pdev)
         if (IS_DMA64) {
                 if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) != 0) {
 
-                        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0)
+                        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0)
                                 goto fail_set_dma_mask;
                 }
         } else {
-                if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0)
+                if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0)
                         goto fail_set_dma_mask;
         }
         return 0;