dma-mapping: replace all DMA_31BIT_MASK macro with DMA_BIT_MASK(31)

Replace all DMA_31BIT_MASK macro with DMA_BIT_MASK(31)

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/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 3b69c2d98dd6..956261f25181 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1206,8 +1206,8 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced)
         aac->fsa_dev = NULL;
         quirks = aac_get_driver_ident(index)->quirks;
         if (quirks & AAC_QUIRK_31BIT) {
-                if (((retval = pci_set_dma_mask(aac->pdev, DMA_31BIT_MASK))) ||
-                  ((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_31BIT_MASK))))
+                if (((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(31)))) ||
+                  ((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_BIT_MASK(31)))))
                         goto out;
         } else {
                 if (((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(32)))) ||
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 3c3ed4b3311a..9b97c3e016fe 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1103,8 +1103,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
          * to driver communication memory to be allocated below 2gig
          */
         if (aac_drivers[index].quirks & AAC_QUIRK_31BIT)
-                if (pci_set_dma_mask(pdev, DMA_31BIT_MASK) ||
-                                pci_set_consistent_dma_mask(pdev, DMA_31BIT_MASK))
+                if (pci_set_dma_mask(pdev, DMA_BIT_MASK(31)) ||
+                                pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(31)))
                         goto out_disable_pdev;
 
         pci_set_master(pdev);
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index abb9a7706ec7..5aa8bce90e1f 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -108,7 +108,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                 case 0x00d8:    /* CK8 */
                 case 0x00e8:    /* CK8S */
                         if (pci_set_consistent_dma_mask(pdev,
-                                                DMA_31BIT_MASK) < 0)
+                                                DMA_BIT_MASK(31)) < 0)
                                 ehci_warn(ehci, "can't enable NVidia "
                                         "workaround for >2GB RAM\n");
                         break;