33 files changed, 57 insertions, 57 deletions

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 6697652740b8..fdb14ec4fd47 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -2018,8 +2018,8 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
 
         if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64))
             || pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)))
-                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))) {
                         TW_PRINTK(host, TW_DRIVER, 0x23, "Failed to set dma mask");
                         retval = -ENODEV;
                         goto out_disable_device;
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
index 0742e6846656..8e71e5e122b3 100644
--- a/drivers/scsi/3w-xxxx.h
+++ b/drivers/scsi/3w-xxxx.h
@@ -234,7 +234,7 @@ static unsigned char tw_sense_table[][4] =
 #define TW_IOCTL_TIMEOUT                      25 /* 25 seconds */
 #define TW_IOCTL_CHRDEV_TIMEOUT               60 /* 60 seconds */
 #define TW_IOCTL_CHRDEV_FREE                  -1
-#define TW_DMA_MASK                           DMA_32BIT_MASK
+#define TW_DMA_MASK                           DMA_BIT_MASK(32)
 #define TW_MAX_CDB_LEN                        16
 
 /* Bitmask macros to eliminate bitfields */
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 2d689af24664..1ddcf4031d4c 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -667,7 +667,7 @@ static int __init BusLogic_InitializeMultiMasterProbeInfo(struct BusLogic_HostAd
                 if (pci_enable_device(PCI_Device))
                         continue;
 
-                if (pci_set_dma_mask(PCI_Device, DMA_32BIT_MASK ))
+                if (pci_set_dma_mask(PCI_Device, DMA_BIT_MASK(32) ))
                         continue;
 
                 Bus = PCI_Device->bus->number;
@@ -834,7 +834,7 @@ static int __init BusLogic_InitializeMultiMasterProbeInfo(struct BusLogic_HostAd
                 if (pci_enable_device(PCI_Device))
                         continue;
 
-                if (pci_set_dma_mask(PCI_Device, DMA_32BIT_MASK))
+                if (pci_set_dma_mask(PCI_Device, DMA_BIT_MASK(32)))
                         continue;
 
                 Bus = PCI_Device->bus->number;
@@ -888,7 +888,7 @@ static int __init BusLogic_InitializeFlashPointProbeInfo(struct BusLogic_HostAda
                 if (pci_enable_device(PCI_Device))
                         continue;
 
-                if (pci_set_dma_mask(PCI_Device, DMA_32BIT_MASK))
+                if (pci_set_dma_mask(PCI_Device, DMA_BIT_MASK(32)))
                         continue;
 
                 Bus = PCI_Device->bus->number;
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index 964769f66eac..208d6df9ed59 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -1094,7 +1094,7 @@ static int __devinit inia100_probe_one(struct pci_dev *pdev,
 
         if (pci_enable_device(pdev))
                 goto out;
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 printk(KERN_WARNING "Unable to set 32bit DMA "
                                     "on inia100 adapter, ignoring.\n");
                 goto out_disable_device;
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index e83ef8aaa98c..280261c451d6 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1407,8 +1407,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
                         if (!dev->in_reset)
                                 printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
                                         dev->name, dev->id);
-                } else if (!pci_set_dma_mask(dev->pdev, DMA_32BIT_MASK) &&
-                        !pci_set_consistent_dma_mask(dev->pdev, DMA_32BIT_MASK)) {
+                } else if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(32)) &&
+                        !pci_set_consistent_dma_mask(dev->pdev, DMA_BIT_MASK(32))) {
                         printk(KERN_INFO"%s%d: DMA mask set failed, 64 Bit DAC disabled\n",
                                 dev->name, dev->id);
                         dev->dac_support = 0;
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index d24c2670040b..3b69c2d98dd6 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -1210,14 +1210,14 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced)
                   ((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_31BIT_MASK))))
                         goto out;
         } else {
-                if (((retval = pci_set_dma_mask(aac->pdev, DMA_32BIT_MASK))) ||
-                  ((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_32BIT_MASK))))
+                if (((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(32)))) ||
+                  ((retval = pci_set_consistent_dma_mask(aac->pdev, DMA_BIT_MASK(32)))))
                         goto out;
         }
         if ((retval = (*(aac_get_driver_ident(index)->init))(aac)))
                 goto out;
         if (quirks & AAC_QUIRK_31BIT)
-                if ((retval = pci_set_dma_mask(aac->pdev, DMA_32BIT_MASK)))
+                if ((retval = pci_set_dma_mask(aac->pdev, DMA_BIT_MASK(32))))
                         goto out;
         if (jafo) {
                 aac->thread = kthread_run(aac_command_thread, aac, aac->name);
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index c507719c0d44..3c3ed4b3311a 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1095,8 +1095,8 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
                 goto out;
         error = -ENODEV;
 
-        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)))
                 goto out_disable_pdev;
         /*
          * If the quirk31 bit is set, the adapter needs adapter
@@ -1154,7 +1154,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
          * address space.
          */
         if (aac_drivers[index].quirks & AAC_QUIRK_31BIT)
-                if (pci_set_dma_mask(pdev, DMA_32BIT_MASK))
+                if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))
                         goto out_deinit;
 
         aac->maximum_num_channels = aac_drivers[index].channels;
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);
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 7edbe4309c61..996f7224f90e 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -793,8 +793,8 @@ static int __devinit asd_pci_probe(struct pci_dev *dev,
         if (!pci_set_dma_mask(dev, DMA_BIT_MASK(64))
             && !pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(64)))
                 ;
-        else if (!pci_set_dma_mask(dev, DMA_32BIT_MASK)
-                 && !pci_set_consistent_dma_mask(dev, DMA_32BIT_MASK))
+        else if (!pci_set_dma_mask(dev, DMA_BIT_MASK(32))
+                 && !pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(32)))
                 ;
         else {
                 asd_printk("no suitable DMA mask for %s\n", pci_name(dev));
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index e95b72dd34b1..80aac01b5a6f 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -395,7 +395,7 @@ static int arcmsr_probe(struct pci_dev *pdev,
 
         error = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
         if (error) {
-                error = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                error = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (error) {
                         printk(KERN_WARNING
                                "scsi%d: No suitable DMA mask available\n",
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c
index 20ca0a6374b5..b137e561f5bc 100644
--- a/drivers/scsi/atp870u.c
+++ b/drivers/scsi/atp870u.c
@@ -2568,7 +2568,7 @@ static int atp870u_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (pci_enable_device(pdev))
                 goto err_eio;
 
-        if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 printk(KERN_INFO "atp870u: use 32bit DMA mask.\n");
         } else {
                 printk(KERN_ERR "atp870u: DMA mask required but not available.\n");
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 75a94e438fa5..b6af63ca980b 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -1015,14 +1015,14 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
          */
         if (sizeof(dma_addr_t) > 4 &&
             pci_set_dma_mask(pDev, DMA_BIT_MASK(64)) == 0) {
-                if (dma_get_required_mask(&pDev->dev) > DMA_32BIT_MASK)
+                if (dma_get_required_mask(&pDev->dev) > DMA_BIT_MASK(32))
                         dma64 = 1;
         }
-        if (!dma64 && pci_set_dma_mask(pDev, DMA_32BIT_MASK) != 0)
+        if (!dma64 && pci_set_dma_mask(pDev, DMA_BIT_MASK(32)) != 0)
                 return -EINVAL;
 
         /* adapter only supports message blocks below 4GB */
-        pci_set_consistent_dma_mask(pDev, DMA_32BIT_MASK);
+        pci_set_consistent_dma_mask(pDev, DMA_BIT_MASK(32));
 
         base_addr0_phys = pci_resource_start(pDev,0);
         hba_map0_area_size = pci_resource_len(pDev,0);
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 976cdd5c94ef..be5099dd94b5 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -1426,7 +1426,7 @@ static int port_detect(unsigned long port_base, unsigned int j,
 
         if (ha->pdev) {
                 pci_set_master(ha->pdev);
-                if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK))
+                if (pci_set_dma_mask(ha->pdev, DMA_BIT_MASK(32)))
                         printk("%s: warning, pci_set_dma_mask failed.\n",
                                ha->board_name);
         }
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 4982344f1f09..185e6bc4dd40 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -5023,7 +5023,7 @@ static int __devinit gdth_pci_probe_one(gdth_pci_str *pcistr,
         /* 64-bit DMA only supported from FW >= x.43 */
         if (!(ha->cache_feat & ha->raw_feat & ha->screen_feat & GDT_64BIT) ||
             !ha->dma64_support) {
-                if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+                if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                         printk(KERN_WARNING "GDT-PCI %d: "
                                 "Unable to set 32-bit DMA\n", ha->hanum);
                                 goto out_free_coal_stat;
@@ -5032,7 +5032,7 @@ static int __devinit gdth_pci_probe_one(gdth_pci_str *pcistr,
                 shp->max_cmd_len = 16;
                 if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                         printk("GDT-PCI %d: 64-bit DMA enabled\n", ha->hanum);
-                } else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+                } else if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                         printk(KERN_WARNING "GDT-PCI %d: "
                                 "Unable to set 64/32-bit DMA\n", ha->hanum);
                         goto out_free_coal_stat;
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index a13d78150cb5..c596ab5f05c3 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -959,7 +959,7 @@ static int __devinit hptiop_probe(struct pci_dev *pcidev,
 
         /* Enable 64bit DMA if possible */
         if (pci_set_dma_mask(pcidev, DMA_BIT_MASK(64))) {
-                if (pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) {
+                if (pci_set_dma_mask(pcidev, DMA_BIT_MASK(32))) {
                         printk(KERN_ERR "hptiop: fail to set dma_mask\n");
                         goto disable_pci_device;
                 }
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 5529518ff2fa..89a59484be02 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -2856,7 +2856,7 @@ static int initio_probe_one(struct pci_dev *pdev,
                 reg = 0;
         bios_seg = (bios_seg << 8) + ((u16) ((reg & 0xFF00) >> 8));
 
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 printk(KERN_WARNING  "i91u: Could not set 32 bit DMA mask\n");
                 error = -ENODEV;
                 goto out_disable_device;
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index def473f0a98f..c09d77591f92 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -7498,7 +7498,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
 
         pci_set_master(pdev);
 
-        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (rc < 0) {
                 dev_err(&pdev->dev, "Failed to set PCI DMA mask\n");
                 goto cleanup_nomem;
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 45296a975f8b..f83a116955f2 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -7051,7 +7051,7 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
             !pci_set_dma_mask(ha->pcidev, DMA_BIT_MASK(64))) {
                 (ha)->flags |= IPS_HA_ENH_SG;
         } else {
-                if (pci_set_dma_mask(ha->pcidev, DMA_32BIT_MASK) != 0) {
+                if (pci_set_dma_mask(ha->pcidev, DMA_BIT_MASK(32)) != 0) {
                         printk(KERN_WARNING "Unable to set DMA Mask\n");
                         return ips_abort_init(ha, index);
                 }
diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c
index f23c4ca9a2ee..b3d31315ac32 100644
--- a/drivers/scsi/lasi700.c
+++ b/drivers/scsi/lasi700.c
@@ -108,7 +108,7 @@ lasi700_probe(struct parisc_device *dev)
         }
 
         hostdata->dev = &dev->dev;
-        dma_set_mask(&dev->dev, DMA_32BIT_MASK);
+        dma_set_mask(&dev->dev, DMA_BIT_MASK(32));
         hostdata->base = ioremap_nocache(base, 0x100);
         hostdata->differential = 0;
 
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index c255b4d94b1b..06874e6009ea 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -2661,7 +2661,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
         pci_try_set_mwi(pdev);
 
         if (pci_set_dma_mask(phba->pcidev, DMA_BIT_MASK(64)) != 0)
-                if (pci_set_dma_mask(phba->pcidev, DMA_32BIT_MASK) != 0)
+                if (pci_set_dma_mask(phba->pcidev, DMA_BIT_MASK(32)) != 0)
                         goto out_idr_remove;
 
         /*
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 112991d46d95..49eb0612d5af 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -2021,7 +2021,7 @@ make_local_pdev(adapter_t *adapter, struct pci_dev **pdev)
 
         memcpy(*pdev, adapter->dev, sizeof(struct pci_dev));
 
-        if( pci_set_dma_mask(*pdev, DMA_32BIT_MASK) != 0 ) {
+        if( pci_set_dma_mask(*pdev, DMA_BIT_MASK(32)) != 0 ) {
                 kfree(*pdev);
                 return -1;
         }
@@ -4796,7 +4796,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
                 adapter->has_64bit_addr = 1;
         } else  {
-                pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 adapter->has_64bit_addr = 0;
         }
                 
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;
diff --git a/drivers/scsi/mvsas.c b/drivers/scsi/mvsas.c
index d8093a288438..e4acebd10d1b 100644
--- a/drivers/scsi/mvsas.c
+++ b/drivers/scsi/mvsas.c
@@ -878,7 +878,7 @@ static int pci_go_64(struct pci_dev *pdev)
         if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
                 if (rc) {
-                        rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                        rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                         if (rc) {
                                 dev_printk(KERN_ERR, &pdev->dev,
                                            "64-bit DMA enable failed\n");
@@ -886,13 +886,13 @@ static int pci_go_64(struct pci_dev *pdev)
                         }
                 }
         } else {
-                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
                         dev_printk(KERN_ERR, &pdev->dev,
                                    "32-bit DMA enable failed\n");
                         return rc;
                 }
-                rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
                         dev_printk(KERN_ERR, &pdev->dev,
                                    "32-bit consistent DMA enable failed\n");
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index d06ec5aa6924..2be7d5b018d2 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -2672,7 +2672,7 @@ static int nsp32_detect(struct pci_dev *pdev)
         /*
          * setup DMA 
          */
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) {
                 nsp32_msg (KERN_ERR, "failed to set PCI DMA mask");
                 goto scsi_unregister;
         }
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 18f7f98ba571..687dcf2d0154 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4276,7 +4276,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
 #ifdef QLA_64BIT_PTR
         if (pci_set_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
-                if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK)) {
+                if (pci_set_dma_mask(ha->pdev, DMA_BIT_MASK(32))) {
                         printk(KERN_WARNING "scsi(%li): Unable to set a "
                                "suitable DMA mask - aborting\n", ha->host_no);
                         error = -ENODEV;
@@ -4286,7 +4286,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                 dprintk(2, "scsi(%li): 64 Bit PCI Addressing Enabled\n",
                         ha->host_no);
 #else
-        if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK)) {
+        if (pci_set_dma_mask(ha->pdev, DMA_BIT_MASK(32))) {
                 printk(KERN_WARNING "scsi(%li): Unable to set a "
                        "suitable DMA mask - aborting\n", ha->host_no);
                 error = -ENODEV;
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index f60e136b5e1b..e4fdcdad80d0 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1188,8 +1188,8 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
                 }
         }
 
-        dma_set_mask(&ha->pdev->dev, DMA_32BIT_MASK);
-        pci_set_consistent_dma_mask(ha->pdev, DMA_32BIT_MASK);
+        dma_set_mask(&ha->pdev->dev, DMA_BIT_MASK(32));
+        pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(32));
 }
 
 static void
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index d427fab7a183..ec9da6ce8489 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1375,10 +1375,10 @@ static void qla4xxx_config_dma_addressing(struct scsi_qla_host *ha)
                                   "Failed to set 64 bit PCI consistent mask; "
                                    "using 32 bit.\n");
                         retval = pci_set_consistent_dma_mask(ha->pdev,
-                                                             DMA_32BIT_MASK);
+                                                             DMA_BIT_MASK(32));
                 }
         } else
-                retval = pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK);
+                retval = pci_set_dma_mask(ha->pdev, DMA_BIT_MASK(32));
 }
 
 static int qla4xxx_slave_alloc(struct scsi_device *sdev)
diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c
index 77f0b2cdaa94..37b3359e863e 100644
--- a/drivers/scsi/sni_53c710.c
+++ b/drivers/scsi/sni_53c710.c
@@ -83,7 +83,7 @@ static int __init snirm710_probe(struct platform_device *dev)
         }
 
         hostdata->dev = &dev->dev;
-        dma_set_mask(&dev->dev, DMA_32BIT_MASK);
+        dma_set_mask(&dev->dev, DMA_BIT_MASK(32));
         hostdata->base = ioremap_nocache(base, 0x100);
         hostdata->differential = 0;
 
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 7cb8063c4355..8d2a95c4e5b5 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -1398,9 +1398,9 @@ static int stex_set_dma_mask(struct pci_dev * pdev)
         if (!pci_set_dma_mask(pdev,  DMA_BIT_MASK(64))
                 && !pci_set_consistent_dma_mask(pdev,  DMA_BIT_MASK(64)))
                 return 0;
-        ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (!ret)
-                ret = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         return ret;
 }
 
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 23e782015880..583966ec8266 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -1349,7 +1349,7 @@ static struct Scsi_Host * __devinit sym_attach(struct scsi_host_template *tpnt,
         if ((SYM_CONF_DMA_ADDRESSING_MODE > 0) && (np->features & FE_DAC) &&
                         !pci_set_dma_mask(pdev, DMA_DAC_MASK)) {
                 set_dac(np);
-        } else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        } else if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 printf_warning("%s: No suitable DMA available\n", sym_name(np));
                 goto attach_failed;
         }
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.h b/drivers/scsi/sym53c8xx_2/sym_hipd.h
index b707abe90821..9ebc8706b6bf 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.h
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.h
@@ -1080,7 +1080,7 @@ int sym_hcb_attach(struct Scsi_Host *shost, struct sym_fw *fw, struct sym_nvram
  */
 
 #if   SYM_CONF_DMA_ADDRESSING_MODE == 0
-#define DMA_DAC_MASK    DMA_32BIT_MASK
+#define DMA_DAC_MASK    DMA_BIT_MASK(32)
 #define sym_build_sge(np, data, badd, len)      \
 do {                                            \
         (data)->addr = cpu_to_scr(badd);        \