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>

diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 3b69c2d98dd6e6b15acca67bdbed5210ecb5cc2a..956261f251817ea5ab0873a60c96835e1bcf13e1 100644 (file)
--- 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 3c3ed4b3311a3e0dde1ca1b51229c99096a73452..9b97c3e016fe8233b0545ea8adab6bb45ff3985d 100644 (file)
--- 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 abb9a7706ec7c370dd0835db9d04b0e3f1abc6b8..5aa8bce90e1f3856d7195db5614394a6c709ba9f 100644 (file)
--- 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;

diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 4edf270a7809c3b20fa5997caf23acd42bb72968..c551006e292054088e5deeaae5baf277403e883a 100644 (file)
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2186,8 +2186,8 @@ static int __devinit snd_ali_create(struct snd_card *card,
        if (err < 0)
                return err;
        /* check, if we can restrict PCI DMA transfers to 31 bits */
-       if (pci_set_dma_mask(pci, DMA_31BIT_MASK) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_31BIT_MASK) < 0) {
+       if (pci_set_dma_mask(pci, DMA_BIT_MASK(31)) < 0 ||
+           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(31)) < 0) {
                snd_printk(KERN_ERR "architecture does not support "
                           "31bit PCI busmaster DMA\n");
                pci_disable_device(pci);