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, 5 insertions, 5 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index c583d89f569a..8f686122d54e 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -197,13 +197,13 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 if (required_mask > DMA_BIT_MASK(39) &&
                     dma_set_mask(dev, DMA_BIT_MASK(64)) == 0)
                         ahd->flags |= AHD_64BIT_ADDRESSING;
-                else if (required_mask > DMA_32BIT_MASK &&
+                else if (required_mask > DMA_BIT_MASK(32) &&
                          dma_set_mask(dev, DMA_BIT_MASK(39)) == 0)
                         ahd->flags |= AHD_39BIT_ADDRESSING;
                 else
-                        dma_set_mask(dev, DMA_32BIT_MASK);
+                        dma_set_mask(dev, DMA_BIT_MASK(32));
         } else {
-                dma_set_mask(dev, DMA_32BIT_MASK);
+                dma_set_mask(dev, DMA_BIT_MASK(32));
         }
         ahd->dev_softc = pci;
         error = ahd_pci_config(ahd, entry);
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
index 00f5b9868574..78fc70c24e07 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
@@ -241,10 +241,10 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (sizeof(dma_addr_t) > 4
             && ahc->features & AHC_LARGE_SCBS
             && dma_set_mask(dev, mask_39bit) == 0
-            && dma_get_required_mask(dev) > DMA_32BIT_MASK) {
+            && dma_get_required_mask(dev) > DMA_BIT_MASK(32)) {
                 ahc->flags |= AHC_39BIT_ADDRESSING;
         } else {
-                if (dma_set_mask(dev, DMA_32BIT_MASK)) {
+                if (dma_set_mask(dev, DMA_BIT_MASK(32))) {
                         ahc_free(ahc);
                         printk(KERN_WARNING "aic7xxx: No suitable DMA available.\n");
                         return (-ENODEV);