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>

29 files changed, 53 insertions, 56 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index a09e3a7cac4f..d08475a7f676 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1929,8 +1929,8 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 
         /* Configure DMA attributes. */
         if ((sizeof(dma_addr_t) > 4) &&
-            !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) &&
-            !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+            !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)) &&
+            !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 pci_using_dac = 1;
         } else {
                 pci_using_dac = 0;
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 06a9f11669f3..9509c17b3667 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -1161,7 +1161,7 @@ static int __devinit ace_init(struct net_device *dev)
         /*
          * Configure DMA attributes.
          */
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 ap->pci_using_dac = 1;
         } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                 ap->pci_using_dac = 0;
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 17cbc8c6be37..aa75a4b96909 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -7527,7 +7527,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
         if (CHIP_NUM(bp) == CHIP_NUM_5708)
                 persist_dma_mask = dma_mask = DMA_40BIT_MASK;
         else
-                persist_dma_mask = dma_mask = DMA_64BIT_MASK;
+                persist_dma_mask = dma_mask = DMA_BIT_MASK(64);
 
         /* Configure DMA attributes. */
         if (pci_set_dma_mask(pdev, dma_mask) == 0) {
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 00a78e8677b0..03e01243b45e 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -10979,9 +10979,9 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
                 goto err_out_release;
         }
 
-        if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) == 0) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) == 0) {
                 bp->flags |= USING_DAC_FLAG;
-                if (pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) != 0) {
+                if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)) != 0) {
                         printk(KERN_ERR PFX "pci_set_consistent_dma_mask"
                                " failed, aborting\n");
                         rc = -EIO;
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 0effefa1b882..c2895240e467 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -5074,10 +5074,10 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
 
 
         /* Configure DMA attributes. */
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 pci_using_dac = 1;
                 err = pci_set_consistent_dma_mask(pdev,
-                                                  DMA_64BIT_MASK);
+                                                  DMA_BIT_MASK(64));
                 if (err < 0) {
                         dev_err(&pdev->dev, "Unable to obtain 64-bit DMA "
                                "for consistent allocations\n");
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 9b6011e7678e..57cfbc369f51 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -1056,10 +1056,10 @@ static int __devinit init_one(struct pci_dev *pdev,
                 goto out_disable_pdev;
         }
 
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 pci_using_dac = 1;
 
-                if (pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
+                if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
                         CH_ERR("%s: unable to obtain 64-bit DMA for "
                                "consistent allocations\n", pci_name(pdev));
                         err = -ENODEV;
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 2c2aaa741450..ec35d3b82409 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -3038,9 +3038,9 @@ static int __devinit init_one(struct pci_dev *pdev,
                 goto out_release_regions;
         }
 
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 pci_using_dac = 1;
-                err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
                 if (err) {
                         dev_err(&pdev->dev, "unable to obtain 64-bit DMA for "
                                "coherent allocations\n");
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index a65023d772cb..caa71dffb3d0 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -962,8 +962,8 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         if (err)
                 return err;
 
-        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))) {
                 pci_using_dac = 1;
         } else {
                 err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index bfb2d6c85c54..4a61160052a3 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4763,9 +4763,9 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                 return err;
 
         pci_using_dac = 0;
-        err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
         if (!err) {
-                err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
                 if (!err)
                         pci_using_dac = 1;
         } else {
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 03aa9593dd9e..82278beaac83 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1154,9 +1154,9 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                 return err;
 
         pci_using_dac = 0;
-        err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
         if (!err) {
-                err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
                 if (!err)
                         pci_using_dac = 1;
         } else {
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 170b12d1d70e..43be0b01f12c 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -1226,10 +1226,10 @@ static int __devinit ioc3_probe(struct pci_dev *pdev,
         int err, pci_using_dac;
 
         /* Configure DMA attributes. */
-        err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
         if (!err) {
                 pci_using_dac = 1;
-                err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
                 if (err < 0) {
                         printk(KERN_ERR "%s: Unable to obtain 64 bit DMA "
                                "for consistent allocations\n", pci_name(pdev));
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 4b0ea66d7a44..0ac51758bc6c 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -365,8 +365,8 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (err)
                 return err;
 
-        if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) &&
-            !(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) {
+        if (!(err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) &&
+            !(err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)))) {
                 pci_using_dac = 1;
         } else {
                 if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) ||
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 286ecc0e6ab7..126735ca6d7f 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -4509,8 +4509,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         if (err)
                 return err;
 
-        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))) {
                 pci_using_dac = 1;
         } else {
                 err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index a66f5b2fd288..fed53fbaf545 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -1076,7 +1076,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 
         pci_set_master(pdev);
 
-        err = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
         if (err) {
                 dev_warn(&pdev->dev, "Warning: couldn't set 64-bit PCI DMA mask.\n");
                 err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
@@ -1085,7 +1085,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                         goto err_release_bar2;
                 }
         }
-        err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+        err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
         if (err) {
                 dev_warn(&pdev->dev, "Warning: couldn't set 64-bit "
                          "consistent PCI DMA mask.\n");
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index aea9fdaa3cd5..27655466dbeb 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -3792,7 +3792,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pci_set_master(pdev);
         dac_enabled = 1;
-        status = pci_set_dma_mask(pdev, DMA_64BIT_MASK);
+        status = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
         if (status != 0) {
                 dac_enabled = 0;
                 dev_err(&pdev->dev,
@@ -3804,7 +3804,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 dev_err(&pdev->dev, "Error %d setting DMA mask\n", status);
                 goto abort_with_enabled;
         }
-        (void)pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+        (void)pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
         mgp->cmd = dma_alloc_coherent(&pdev->dev, sizeof(*mgp->cmd),
                                       &mgp->cmd_bus, GFP_KERNEL);
         if (mgp->cmd == NULL)
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 221b0c4c824a..e30ab06e7103 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1973,7 +1973,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev,
 
         /* See if we can set the dma mask early on; failure is fatal. */
         if (sizeof(dma_addr_t) == 8 &&
-                !pci_set_dma_mask(pci_dev, DMA_64BIT_MASK)) {
+                !pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64))) {
                 using_dac = 1;
         } else if (!pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) {
                 using_dac = 0;
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 8b2823c8dccf..aef047e4515a 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -3934,9 +3934,9 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
 
         pci_set_master(pdev);
 
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 pci_using_dac = 1;
-                err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
         } else if (!(err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
                 pci_using_dac = 0;
                 err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 170d3540f9c9..0add30d38d62 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3726,9 +3726,9 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
         }
 
         pci_set_master(pdev);
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 set_bit(QL_DMA64, &qdev->flags);
-                err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
         } else {
                 err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                 if (!err)
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index e1a638a05f86..fe676d38d342 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2046,7 +2046,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         tp->cp_cmd = PCIMulRW | RxChkSum;
 
         if ((sizeof(dma_addr_t) > 4) &&
-            !pci_set_dma_mask(pdev, DMA_64BIT_MASK) && use_dac) {
+            !pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) && use_dac) {
                 tp->cp_cmd |= PCIDAC;
                 dev->features |= NETIF_F_HIGHDMA;
         } else {
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 16868b7a5d0a..7c8d5613a1da 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -7775,11 +7775,11 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 return ret;
         }
 
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 64bit DMA\n");
                 dma_flag = TRUE;
                 if (pci_set_consistent_dma_mask
-                    (pdev, DMA_64BIT_MASK)) {
+                    (pdev, DMA_BIT_MASK(64))) {
                         DBG_PRINT(ERR_DBG,
                                   "Unable to obtain 64bit DMA for \
                                         consistent allocations\n");
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 952d37ffee51..18a7b662aff1 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3912,9 +3912,9 @@ static int __devinit skge_probe(struct pci_dev *pdev,
 
         pci_set_master(pdev);
 
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 using_dac = 1;
-                err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
         } else if (!(err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
                 using_dac = 0;
                 err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index d01c56eb9627..da570f44b12b 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4374,9 +4374,9 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
         pci_set_master(pdev);
 
         if (sizeof(dma_addr_t) > sizeof(u32) &&
-            !(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) {
+            !(err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))) {
                 using_dac = 1;
-                err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
                 if (err < 0) {
                         dev_err(&pdev->dev, "unable to obtain 64 bit DMA "
                                 "for consistent allocations\n");
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index c024352c92fd..2312d10f3b54 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -3042,7 +3042,7 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
          */
         if (pdev->vendor == PCI_VENDOR_ID_SUN &&
             pdev->device == PCI_DEVICE_ID_SUN_GEM &&
-            !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
+            !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 pci_using_dac = 1;
         } else {
                 err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 7debd1e4e1f7..d77a0918a325 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -1941,8 +1941,8 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if ((err = pci_enable_device(pdev)))    /* it trigers interrupt, dunno why. */
                 goto err_pci;                   /* it's not a problem though */
 
-        if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) &&
-            !(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) {
+        if (!(err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) &&
+            !(err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)))) {
                 pci_using_dac = 1;
         } else {
                 if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) ||
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h
index dec67e0a9ca2..121dda917fdc 100644
--- a/drivers/net/tehuti.h
+++ b/drivers/net/tehuti.h
@@ -31,6 +31,7 @@
 #include <linux/vmalloc.h>
 #include <linux/firmware.h>
 #include <asm/byteorder.h>
+#include <linux/dma-mapping.h>
 
 /* Compile Time Switches */
 /* start */
@@ -98,10 +99,6 @@
 #define READ_REG(pp, reg)         readl(pp->pBdxRegs + reg)
 #define WRITE_REG(pp, reg, val)   writel(val, pp->pBdxRegs + reg)
 
-#ifndef DMA_64BIT_MASK
-#   define DMA_64BIT_MASK  0xffffffffffffffffULL
-#endif
-
 #ifndef DMA_32BIT_MASK
 #   define DMA_32BIT_MASK  0x00000000ffffffffULL
 #endif
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 437683aab32c..ec32e5f23548 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -13232,10 +13232,10 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         else if (tp->tg3_flags & TG3_FLAG_40BIT_DMA_BUG) {
                 persist_dma_mask = dma_mask = DMA_40BIT_MASK;
 #ifdef CONFIG_HIGHMEM
-                dma_mask = DMA_64BIT_MASK;
+                dma_mask = DMA_BIT_MASK(64);
 #endif
         } else
-                persist_dma_mask = dma_mask = DMA_64BIT_MASK;
+                persist_dma_mask = dma_mask = DMA_BIT_MASK(64);
 
         /* Configure DMA attributes. */
         if (dma_mask > DMA_32BIT_MASK) {
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 659654f45880..f3a2fce6166c 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1180,7 +1180,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 #if 0
 // dma_supported() is deeply broken on almost all architectures
         // possible with some EHCI controllers
-        if (dma_supported (&udev->dev, DMA_64BIT_MASK))
+        if (dma_supported (&udev->dev, DMA_BIT_MASK(64)))
                 net->features |= NETIF_F_HIGHDMA;
 #endif
 
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index 0cc804d0a214..461d680d2cec 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -772,7 +772,7 @@ static u64 supported_dma_mask(struct b43_wldev *dev)
 
         tmp = b43_read32(dev, SSB_TMSHIGH);
         if (tmp & SSB_TMSHIGH_DMA64)
-                return DMA_64BIT_MASK;
+                return DMA_BIT_MASK(64);
         mmio_base = b43_dmacontroller_base(0, 0);
         b43_write32(dev, mmio_base + B43_DMA32_TXCTL, B43_DMA32_TXADDREXT_MASK);
         tmp = b43_read32(dev, mmio_base + B43_DMA32_TXCTL);
@@ -788,7 +788,7 @@ static enum b43_dmatype dma_mask_to_engine_type(u64 dmamask)
                 return B43_DMA_30BIT;
         if (dmamask == DMA_32BIT_MASK)
                 return B43_DMA_32BIT;
-        if (dmamask == DMA_64BIT_MASK)
+        if (dmamask == DMA_BIT_MASK(64))
                 return B43_DMA_64BIT;
         B43_WARN_ON(1);
         return B43_DMA_30BIT;
@@ -999,7 +999,7 @@ static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask)
                 err = ssb_dma_set_mask(dev->dev, mask);
                 if (!err)
                         break;
-                if (mask == DMA_64BIT_MASK) {
+                if (mask == DMA_BIT_MASK(64)) {
                         mask = DMA_32BIT_MASK;
                         fallback = 1;
                         continue;
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index 3649fc367098..61bb91266aa8 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -846,7 +846,7 @@ static u64 supported_dma_mask(struct b43legacy_wldev *dev)
 
         tmp = b43legacy_read32(dev, SSB_TMSHIGH);
         if (tmp & SSB_TMSHIGH_DMA64)
-                return DMA_64BIT_MASK;
+                return DMA_BIT_MASK(64);
         mmio_base = b43legacy_dmacontroller_base(0, 0);
         b43legacy_write32(dev,
                         mmio_base + B43legacy_DMA32_TXCTL,
@@ -865,7 +865,7 @@ static enum b43legacy_dmatype dma_mask_to_engine_type(u64 dmamask)
                 return B43legacy_DMA_30BIT;
         if (dmamask == DMA_32BIT_MASK)
                 return B43legacy_DMA_32BIT;
-        if (dmamask == DMA_64BIT_MASK)
+        if (dmamask == DMA_BIT_MASK(64))
                 return B43legacy_DMA_64BIT;
         B43legacy_WARN_ON(1);
         return B43legacy_DMA_30BIT;
@@ -1042,7 +1042,7 @@ static int b43legacy_dma_set_mask(struct b43legacy_wldev *dev, u64 mask)
                 err = ssb_dma_set_mask(dev->dev, mask);
                 if (!err)
                         break;
-                if (mask == DMA_64BIT_MASK) {
+                if (mask == DMA_BIT_MASK(64)) {
                         mask = DMA_32BIT_MASK;
                         fallback = 1;
                         continue;