Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n)

This is the second go through of the old DMA_nBIT_MASK macro,and there're not
so many of them left,so I put them into one patch.I hope this is the last round.
After this the definition of the old DMA_nBIT_MASK macro could be removed.

Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Tony Lindgren <tony@atomide.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Greg KH <greg@kroah.com>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 52427a8324f..a91f5143cea 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -855,9 +855,9 @@ _base_config_dma_addressing(struct MPT2SAS_ADAPTER *ioc, struct pci_dev *pdev)
         if (sizeof(dma_addr_t) > 4) {
                 const uint64_t required_mask =
                     dma_get_required_mask(&pdev->dev);
-                if ((required_mask > DMA_32BIT_MASK) && !pci_set_dma_mask(pdev,
-                    DMA_64BIT_MASK) && !pci_set_consistent_dma_mask(pdev,
-                    DMA_64BIT_MASK)) {
+                if ((required_mask > DMA_BIT_MASK(32)) && !pci_set_dma_mask(pdev,
+                    DMA_BIT_MASK(64)) && !pci_set_consistent_dma_mask(pdev,
+                    DMA_BIT_MASK(64))) {
                         ioc->base_add_sg_single = &_base_add_sg_single_64;
                         ioc->sge_size = sizeof(Mpi2SGESimple64_t);
                         desc = "64";
@@ -865,8 +865,8 @@ _base_config_dma_addressing(struct MPT2SAS_ADAPTER *ioc, struct pci_dev *pdev)
                 }
         }
 
-        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))) {
                 ioc->base_add_sg_single = &_base_add_sg_single_32;
                 ioc->sge_size = sizeof(Mpi2SGESimple32_t);
                 desc = "32";