dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)

Replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)

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>

19 files changed, 26 insertions, 26 deletions

diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index a12783ebb42..6697652740b 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -2016,8 +2016,8 @@ static int __devinit twa_probe(struct pci_dev *pdev, const struct pci_device_id
         pci_set_master(pdev);
         pci_try_set_mwi(pdev);
 
-        if (pci_set_dma_mask(pdev, DMA_64BIT_MASK)
-            || pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))
+        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)) {
                         TW_PRINTK(host, TW_DRIVER, 0x23, "Failed to set dma mask");
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index 21964aaebca..e83ef8aaa98 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -1402,8 +1402,8 @@ int aac_get_adapter_info(struct aac_dev* dev)
         }
 
         if(dev->dac_support != 0) {
-                if (!pci_set_dma_mask(dev->pdev, DMA_64BIT_MASK) &&
-                        !pci_set_consistent_dma_mask(dev->pdev, DMA_64BIT_MASK)) {
+                if (!pci_set_dma_mask(dev->pdev, DMA_BIT_MASK(64)) &&
+                        !pci_set_consistent_dma_mask(dev->pdev, DMA_BIT_MASK(64))) {
                         if (!dev->in_reset)
                                 printk(KERN_INFO"%s%d: 64 Bit DAC enabled\n",
                                         dev->name, dev->id);
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 6593056867f..032e2b120b3 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
@@ -195,7 +195,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 const u64 required_mask = dma_get_required_mask(dev);
 
                 if (required_mask > DMA_39BIT_MASK &&
-                    dma_set_mask(dev, DMA_64BIT_MASK) == 0)
+                    dma_set_mask(dev, DMA_BIT_MASK(64)) == 0)
                         ahd->flags |= AHD_64BIT_ADDRESSING;
                 else if (required_mask > DMA_32BIT_MASK &&
                          dma_set_mask(dev, DMA_39BIT_MASK) == 0)
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 2a730c470f6..7edbe4309c6 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -790,8 +790,8 @@ static int __devinit asd_pci_probe(struct pci_dev *dev,
                 goto Err_remove;
 
         err = -ENODEV;
-        if (!pci_set_dma_mask(dev, DMA_64BIT_MASK)
-            && !pci_set_consistent_dma_mask(dev, DMA_64BIT_MASK))
+        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))
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
index 106c04d2d79..e95b72dd34b 100644
--- a/drivers/scsi/arcmsr/arcmsr_hba.c
+++ b/drivers/scsi/arcmsr/arcmsr_hba.c
@@ -393,7 +393,7 @@ static int arcmsr_probe(struct pci_dev *pdev,
         acb = (struct AdapterControlBlock *)host->hostdata;
         memset(acb, 0, sizeof (struct AdapterControlBlock));
 
-        error = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+        error = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
         if (error) {
                 error = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (error) {
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 6194ed5d02c..75a94e438fa 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -1014,7 +1014,7 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
          *      See if we should enable dma64 mode.
          */
         if (sizeof(dma_addr_t) > 4 &&
-            pci_set_dma_mask(pDev, DMA_64BIT_MASK) == 0) {
+            pci_set_dma_mask(pDev, DMA_BIT_MASK(64)) == 0) {
                 if (dma_get_required_mask(&pDev->dev) > DMA_32BIT_MASK)
                         dma64 = 1;
         }
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index fb247fdfa2b..4982344f1f0 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -5030,7 +5030,7 @@ static int __devinit gdth_pci_probe_one(gdth_pci_str *pcistr,
                 }
         } else {
                 shp->max_cmd_len = 16;
-                if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+                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)) {
                         printk(KERN_WARNING "GDT-PCI %d: "
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index af1f0af0c5a..a13d78150cb 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -958,7 +958,7 @@ static int __devinit hptiop_probe(struct pci_dev *pcidev,
         pci_set_master(pcidev);
 
         /* Enable 64bit DMA if possible */
-        if (pci_set_dma_mask(pcidev, DMA_64BIT_MASK)) {
+        if (pci_set_dma_mask(pcidev, DMA_BIT_MASK(64))) {
                 if (pci_set_dma_mask(pcidev, DMA_32BIT_MASK)) {
                         printk(KERN_ERR "hptiop: fail to set dma_mask\n");
                         goto disable_pci_device;
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 457d76a4cfe..45296a975f8 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -7048,7 +7048,7 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
          * are guaranteed to be < 4G.
          */
         if (IPS_ENABLE_DMA64 && IPS_HAS_ENH_SGLIST(ha) &&
-            !pci_set_dma_mask(ha->pcidev, DMA_64BIT_MASK)) {
+            !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) {
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 6c867311cef..c255b4d94b1 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -2660,7 +2660,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
         pci_save_state(pdev);
         pci_try_set_mwi(pdev);
 
-        if (pci_set_dma_mask(phba->pcidev, DMA_64BIT_MASK) != 0)
+        if (pci_set_dma_mask(phba->pcidev, DMA_BIT_MASK(64)) != 0)
                 if (pci_set_dma_mask(phba->pcidev, DMA_32BIT_MASK) != 0)
                         goto out_idr_remove;
 
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 9fdcd60c549..112991d46d9 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -4793,7 +4793,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         /* Set the Mode of addressing to 64 bit if we can */
         if ((adapter->flag & BOARD_64BIT) && (sizeof(dma_addr_t) == 8)) {
-                pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+                pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
                 adapter->has_64bit_addr = 1;
         } else  {
                 pci_set_dma_mask(pdev, DMA_32BIT_MASK);
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 805bb61dde1..b2c19449119 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -900,7 +900,7 @@ megaraid_init_mbox(adapter_t *adapter)
                 adapter->pdev->device == PCI_DEVICE_ID_PERC4_DI_EVERGLADES) ||
                 (adapter->pdev->vendor == PCI_VENDOR_ID_DELL &&
                 adapter->pdev->device == PCI_DEVICE_ID_PERC4E_DI_KOBUK)) {
-                if (pci_set_dma_mask(adapter->pdev, DMA_64BIT_MASK)) {
+                if (pci_set_dma_mask(adapter->pdev, DMA_BIT_MASK(64))) {
                         con_log(CL_ANN, (KERN_WARNING
                                 "megaraid: DMA mask for 64-bit failed\n"));
 
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 17ce7abe17e..713de85771f 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -2497,7 +2497,7 @@ megasas_set_dma_mask(struct pci_dev *pdev)
          * All our contollers are capable of performing 64-bit DMA
          */
         if (IS_DMA64) {
-                if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) != 0) {
+                if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) != 0) {
 
                         if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0)
                                 goto fail_set_dma_mask;
diff --git a/drivers/scsi/mvsas.c b/drivers/scsi/mvsas.c
index 23e5a876bb1..d8093a28843 100644
--- a/drivers/scsi/mvsas.c
+++ b/drivers/scsi/mvsas.c
@@ -875,8 +875,8 @@ static int pci_go_64(struct pci_dev *pdev)
 {
         int rc;
 
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
-                rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+        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);
                         if (rc) {
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 351b56ced92..18f7f98ba57 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4275,7 +4275,7 @@ qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
         ha->devnum = devnum;    /* specifies microcode load address */
 
 #ifdef QLA_64BIT_PTR
-        if (pci_set_dma_mask(ha->pdev, DMA_64BIT_MASK)) {
+        if (pci_set_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
                 if (pci_set_dma_mask(ha->pdev, DMA_32BIT_MASK)) {
                         printk(KERN_WARNING "scsi(%li): Unable to set a "
                                "suitable DMA mask - aborting\n", ha->host_no);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index efe29924e05..f60e136b5e1 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1176,10 +1176,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
         /* Assume a 32bit DMA mask. */
         ha->flags.enable_64bit_addressing = 0;
 
-        if (!dma_set_mask(&ha->pdev->dev, DMA_64BIT_MASK)) {
+        if (!dma_set_mask(&ha->pdev->dev, DMA_BIT_MASK(64))) {
                 /* Any upper-dword bits set? */
                 if (MSD(dma_get_required_mask(&ha->pdev->dev)) &&
-                    !pci_set_consistent_dma_mask(ha->pdev, DMA_64BIT_MASK)) {
+                    !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
                         /* Ok, a 64bit DMA mask is applicable. */
                         ha->flags.enable_64bit_addressing = 1;
                         ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index eb3a414b189..d427fab7a18 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1369,8 +1369,8 @@ static void qla4xxx_config_dma_addressing(struct scsi_qla_host *ha)
         int retval;
 
         /* Update our PCI device dma_mask for full 64 bit mask */
-        if (pci_set_dma_mask(ha->pdev, DMA_64BIT_MASK) == 0) {
-                if (pci_set_consistent_dma_mask(ha->pdev, DMA_64BIT_MASK)) {
+        if (pci_set_dma_mask(ha->pdev, DMA_BIT_MASK(64)) == 0) {
+                if (pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
                         dev_dbg(&ha->pdev->dev,
                                   "Failed to set 64 bit PCI consistent mask; "
                                    "using 32 bit.\n");
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index df7f96caa1c..7cb8063c435 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -1395,8 +1395,8 @@ static int stex_set_dma_mask(struct pci_dev * pdev)
 {
         int ret;
 
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)
-                && !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))
+        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);
         if (!ret)
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.h b/drivers/scsi/sym53c8xx_2/sym_hipd.h
index 1588c90518d..76f6295ee88 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.h
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.h
@@ -1094,7 +1094,7 @@ do {									\
         (data)->size = cpu_to_scr((((badd) >> 8) & 0xff000000) + len);  \
 } while (0)
 #elif SYM_CONF_DMA_ADDRESSING_MODE == 2
-#define DMA_DAC_MASK    DMA_64BIT_MASK
+#define DMA_DAC_MASK    DMA_BIT_MASK(64)
 int sym_lookup_dmap(struct sym_hcb *np, u32 h, int s);
 static inline void
 sym_build_sge(struct sym_hcb *np, struct sym_tblmove *data, u64 badd, int len)