58 files changed, 98 insertions, 102 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index d08475a7f676..02330f3d5a55 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1530,7 +1530,7 @@ static void cp_get_ethtool_stats (struct net_device *dev,
 
         /* begin NIC statistics dump */
         cpw32(StatsAddr + 4, (u64)dma >> 32);
-        cpw32(StatsAddr, ((u64)dma & DMA_32BIT_MASK) | DumpStats);
+        cpw32(StatsAddr, ((u64)dma & DMA_BIT_MASK(32)) | DumpStats);
         cpr32(StatsAddr);
 
         for (i = 0; i < 1000; i++) {
@@ -1935,13 +1935,13 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         } else {
                 pci_using_dac = 0;
 
-                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
                         dev_err(&pdev->dev,
                                    "No usable DMA configuration, aborting.\n");
                         goto err_out_res;
                 }
-                rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
                         dev_err(&pdev->dev,
                                    "No usable consistent DMA configuration, "
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 9509c17b3667..57bc71527850 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -1163,7 +1163,7 @@ static int __devinit ace_init(struct net_device *dev)
          */
         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)) {
+        } else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 ap->pci_using_dac = 0;
         } else {
                 ecode = -ENODEV;
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index cb9c95d3ed0a..19831bd64016 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1871,7 +1871,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
         }
 
         /* Initialize DMA */
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) < 0) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) < 0) {
                 printk(KERN_ERR "amd8111e: DMA not supported,"
                         "exiting.\n");
                 goto err_free_reg;
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index c758884728a5..fb57b750866b 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -2326,8 +2326,8 @@ static int __devinit atl1e_probe(struct pci_dev *pdev,
          * various kernel subsystems to support the mechanics required by a
          * fixed-high-32-bit system.
          */
-        if ((pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0) ||
-            (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK) != 0)) {
+        if ((pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) ||
+            (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)) != 0)) {
                 dev_err(&pdev->dev, "No usable DMA configuration,aborting\n");
                 goto err_dma;
         }
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 43fc1b2ca3cd..0ab22540bf59 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -2929,7 +2929,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev,
          * various kernel subsystems to support the mechanics required by a
          * fixed-high-32-bit system.
          */
-        err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (err) {
                 dev_err(&pdev->dev, "no usable DMA configuration\n");
                 goto err_dma;
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index 9fe06c3f4097..c734b1983ec1 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -1358,8 +1358,8 @@ static int __devinit atl2_probe(struct pci_dev *pdev,
          * until the kernel has the proper infrastructure to support 64-bit DMA
          * on these devices.
          */
-        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))) {
                 printk(KERN_ERR "atl2: No usable DMA configuration, aborting\n");
                 goto err_dma;
         }
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 5fd57703c65a..9d268be0b670 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -7538,7 +7538,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
                                 "pci_set_consistent_dma_mask failed, aborting.\n");
                         goto err_out_unmap;
                 }
-        } else if ((rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) != 0) {
+        } else if ((rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {
                 dev_err(&pdev->dev, "System does not support DMA, aborting.\n");
                 goto err_out_unmap;
         }
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 03e01243b45e..ad5ef25add3e 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -10988,7 +10988,7 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
                         goto err_out_release;
                 }
 
-        } else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) != 0) {
+        } else if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) != 0) {
                 printk(KERN_ERR PFX "System does not support DMA,"
                        " aborting\n");
                 rc = -EIO;
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index c2895240e467..f5222764061c 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -5085,7 +5085,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
                 }
 
         } else {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         dev_err(&pdev->dev, "No usable DMA configuration, "
                                "aborting.\n");
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 57cfbc369f51..fa06994f9737 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -1066,7 +1066,7 @@ static int __devinit init_one(struct pci_dev *pdev,
                         goto out_disable_pdev;
                 }
 
-        } else if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) != 0) {
+        } else if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {
                 CH_ERR("%s: no usable DMA configuration\n", pci_name(pdev));
                 goto out_disable_pdev;
         }
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index ec35d3b82409..ab0e5febef83 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -3046,7 +3046,7 @@ static int __devinit init_one(struct pci_dev *pdev,
                                "coherent allocations\n");
                         goto out_disable_device;
                 }
-        } else if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) != 0) {
+        } else if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) != 0) {
                 dev_err(&pdev->dev, "no usable DMA configuration\n");
                 goto out_disable_device;
         }
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 0504db9ad643..5c0b457c7868 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2604,7 +2604,7 @@ static int __devinit e100_probe(struct pci_dev *pdev,
                 goto err_out_disable_pdev;
         }
 
-        if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
+        if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
                 DPRINTK(PROBE, ERR, "No usable DMA configuration, aborting.\n");
                 goto err_out_free_res;
         }
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index caa71dffb3d0..ddc5c533e89c 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -966,9 +966,9 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
             !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 pci_using_dac = 1;
         } else {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
-                        err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                        err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                         if (err) {
                                 E1000_ERR("No usable DMA configuration, "
                                           "aborting\n");
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 4a61160052a3..409b58cad0e5 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -2203,7 +2203,7 @@ static void e1000_configure_tx(struct e1000_adapter *adapter)
         /* Setup the HW Tx Head and Tail descriptor pointers */
         tdba = tx_ring->dma;
         tdlen = tx_ring->count * sizeof(struct e1000_tx_desc);
-        ew32(TDBAL, (tdba & DMA_32BIT_MASK));
+        ew32(TDBAL, (tdba & DMA_BIT_MASK(32)));
         ew32(TDBAH, (tdba >> 32));
         ew32(TDLEN, tdlen);
         ew32(TDH, 0);
@@ -2459,7 +2459,7 @@ static void e1000_configure_rx(struct e1000_adapter *adapter)
          * the Base and Length of the Rx Descriptor Ring
          */
         rdba = rx_ring->dma;
-        ew32(RDBAL, (rdba & DMA_32BIT_MASK));
+        ew32(RDBAL, (rdba & DMA_BIT_MASK(32)));
         ew32(RDBAH, (rdba >> 32));
         ew32(RDLEN, rdlen);
         ew32(RDH, 0);
@@ -4769,10 +4769,10 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                 if (!err)
                         pci_using_dac = 1;
         } else {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         err = pci_set_consistent_dma_mask(pdev,
-                                                          DMA_32BIT_MASK);
+                                                          DMA_BIT_MASK(32));
                         if (err) {
                                 dev_err(&pdev->dev, "No usable DMA "
                                         "configuration, aborting\n");
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 5b87105ac9e0..9080f07da8fe 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -1687,13 +1687,13 @@ static int __devinit enic_probe(struct pci_dev *pdev,
 
         err = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
         if (err) {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         printk(KERN_ERR PFX
                                 "No usable DMA configuration, aborting.\n");
                         goto err_out_release_regions;
                 }
-                err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         printk(KERN_ERR PFX
                                 "Unable to obtain 32-bit DMA "
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index ad8be7e78290..de3f49f991a3 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -580,7 +580,7 @@ static int __devinit hp100_probe1(struct net_device *dev, int ioaddr,
                          * Also, we can have EISA Busmaster cards (not tested),
                          * so beware !!! - Jean II */
                         if((bus == HP100_BUS_PCI) &&
-                           (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK))) {
+                           (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32)))) {
                                 /* Gracefully fallback to shared memory */
                                 goto busmasterfail;
                         }
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 82278beaac83..6b0697c565b9 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1160,9 +1160,9 @@ static int __devinit igb_probe(struct pci_dev *pdev,
                 if (!err)
                         pci_using_dac = 1;
         } else {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
-                        err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                        err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                         if (err) {
                                 dev_err(&pdev->dev, "No usable DMA "
                                         "configuration, aborting\n");
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 43be0b01f12c..cbc63ff13add 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -1236,7 +1236,7 @@ static int __devinit ioc3_probe(struct pci_dev *pdev,
                         goto out;
                 }
         } else {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         printk(KERN_ERR "%s: No usable DMA configuration, "
                                "aborting.\n", pci_name(pdev));
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c
index ed9ded939d96..43019461b776 100644
--- a/drivers/net/ipg.c
+++ b/drivers/net/ipg.c
@@ -2242,7 +2242,7 @@ static int __devinit ipg_probe(struct pci_dev *pdev,
 
         rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
         if (rc < 0) {
-                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc < 0) {
                         printk(KERN_ERR "%s: DMA config failed.\n",
                                pci_name(pdev));
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 0ac51758bc6c..4a0826b8f6f2 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -369,8 +369,8 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
             !(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)) ||
-                    (err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))) {
+                if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) ||
+                    (err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)))) {
                         printk(KERN_ERR
                          "ixgb: No usable DMA configuration, aborting\n");
                         goto err_dma_mask;
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 126735ca6d7f..9ef128ae6458 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1643,7 +1643,7 @@ static void ixgbe_configure_tx(struct ixgbe_adapter *adapter)
                 tdba = ring->dma;
                 tdlen = ring->count * sizeof(union ixgbe_adv_tx_desc);
                 IXGBE_WRITE_REG(hw, IXGBE_TDBAL(j),
-                                (tdba & DMA_32BIT_MASK));
+                                (tdba & DMA_BIT_MASK(32)));
                 IXGBE_WRITE_REG(hw, IXGBE_TDBAH(j), (tdba >> 32));
                 IXGBE_WRITE_REG(hw, IXGBE_TDLEN(j), tdlen);
                 IXGBE_WRITE_REG(hw, IXGBE_TDH(j), 0);
@@ -1782,7 +1782,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter)
         for (i = 0; i < adapter->num_rx_queues; i++) {
                 rdba = adapter->rx_ring[i].dma;
                 j = adapter->rx_ring[i].reg_idx;
-                IXGBE_WRITE_REG(hw, IXGBE_RDBAL(j), (rdba & DMA_32BIT_MASK));
+                IXGBE_WRITE_REG(hw, IXGBE_RDBAL(j), (rdba & DMA_BIT_MASK(32)));
                 IXGBE_WRITE_REG(hw, IXGBE_RDBAH(j), (rdba >> 32));
                 IXGBE_WRITE_REG(hw, IXGBE_RDLEN(j), rdlen);
                 IXGBE_WRITE_REG(hw, IXGBE_RDH(j), 0);
@@ -4513,9 +4513,9 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
             !pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 pci_using_dac = 1;
         } else {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
-                        err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                        err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                         if (err) {
                                 dev_err(&pdev->dev, "No usable DMA "
                                         "configuration, aborting\n");
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 860dcd98a07c..ece35040288c 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -2600,8 +2600,8 @@ jme_pci_dma64(struct pci_dev *pdev)
                 if (!pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK))
                         return 1;
 
-        if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK))
-                if (!pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))
+        if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))
+                if (!pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)))
                         return 0;
 
         return -1;
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index fed53fbaf545..102bac90a302 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -1079,7 +1079,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         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);
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         dev_err(&pdev->dev, "Can't set PCI DMA mask, aborting.\n");
                         goto err_release_bar2;
@@ -1089,7 +1089,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
         if (err) {
                 dev_warn(&pdev->dev, "Warning: couldn't set 64-bit "
                          "consistent PCI DMA mask.\n");
-                err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         dev_err(&pdev->dev, "Can't set consistent PCI DMA mask, "
                                 "aborting.\n");
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 27655466dbeb..9eed126a82f0 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1130,7 +1130,7 @@ myri10ge_submit_8rx(struct mcp_kreq_ether_recv __iomem * dst,
         __be32 low;
 
         low = src->addr_low;
-        src->addr_low = htonl(DMA_32BIT_MASK);
+        src->addr_low = htonl(DMA_BIT_MASK(32));
         myri10ge_pio_copy(dst, src, 4 * sizeof(*src));
         mb();
         myri10ge_pio_copy(dst + 4, src + 4, 4 * sizeof(*src));
@@ -3798,7 +3798,7 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 dev_err(&pdev->dev,
                         "64-bit pci address mask was refused, "
                         "trying 32-bit\n");
-                status = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                status = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         }
         if (status != 0) {
                 dev_err(&pdev->dev, "Error %d setting DMA mask\n", status);
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 02c37e2f08a9..73cac6c78cb6 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -9889,8 +9889,8 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev,
                         goto err_out_release_parent;
                 }
         }
-        if (err || dma_mask == DMA_32BIT_MASK) {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        if (err || dma_mask == DMA_BIT_MASK(32)) {
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         dev_err(&pdev->dev, PFX "No usable DMA configuration, "
                                 "aborting.\n");
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index e30ab06e7103..d531614a90b5 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1975,7 +1975,7 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev,
         if (sizeof(dma_addr_t) == 8 &&
                 !pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64))) {
                 using_dac = 1;
-        } else if (!pci_set_dma_mask(pci_dev, DMA_32BIT_MASK)) {
+        } else if (!pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {
                 using_dac = 0;
         } else {
                 dev_warn(&pci_dev->dev, "pci_set_dma_mask failed!\n");
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index aef047e4515a..cadc32c94c1e 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -3937,9 +3937,9 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
         if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 pci_using_dac = 1;
                 err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
-        } else if (!(err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
+        } else if (!(err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
                 pci_using_dac = 0;
-                err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         }
 
         if (err) {
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 0add30d38d62..c92ced247947 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3730,9 +3730,9 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
                 set_bit(QL_DMA64, &qdev->flags);
                 err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
         } else {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (!err)
-                       err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                       err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         }
 
         if (err) {
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 0a37f9902a07..5e8540b6ffa1 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -1085,13 +1085,13 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
                 goto err_out;
 
         /* this should always be supported */
-        err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (err) {
                 printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses"
                                 "not supported by the card\n");
                 goto err_out;
         }
-        err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+        err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         if (err) {
                 printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses"
                                 "not supported by the card\n");
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index fe676d38d342..0b6e8c896835 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1148,7 +1148,7 @@ static void rtl8169_update_counters(struct net_device *dev)
                 return;
 
         RTL_W32(CounterAddrHigh, (u64)paddr >> 32);
-        cmd = (u64)paddr & DMA_32BIT_MASK;
+        cmd = (u64)paddr & DMA_BIT_MASK(32);
         RTL_W32(CounterAddrLow, cmd);
         RTL_W32(CounterAddrLow, cmd | CounterDump);
 
@@ -2050,7 +2050,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 tp->cp_cmd |= PCIDAC;
                 dev->features |= NETIF_F_HIGHDMA;
         } else {
-                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc < 0) {
                         if (netif_msg_probe(tp)) {
                                 dev_err(&pdev->dev,
@@ -2343,9 +2343,9 @@ static void rtl_set_rx_tx_desc_registers(struct rtl8169_private *tp,
          * Switching from MMIO to I/O access fixes the issue as well.
          */
         RTL_W32(TxDescStartAddrHigh, ((u64) tp->TxPhyAddr) >> 32);
-        RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr) & DMA_32BIT_MASK);
+        RTL_W32(TxDescStartAddrLow, ((u64) tp->TxPhyAddr) & DMA_BIT_MASK(32));
         RTL_W32(RxDescAddrHigh, ((u64) tp->RxPhyAddr) >> 32);
-        RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr) & DMA_32BIT_MASK);
+        RTL_W32(RxDescAddrLow, ((u64) tp->RxPhyAddr) & DMA_BIT_MASK(32));
 }
 
 static u16 rtl_rw_cpluscmd(void __iomem *ioaddr)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 7c8d5613a1da..1a4979f27fb5 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -7786,7 +7786,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                         pci_disable_device(pdev);
                         return -ENOMEM;
                 }
-        } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        } else if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 32bit DMA\n");
         } else {
                 pci_disable_device(pdev);
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index c13cbf099b88..18821f217e19 100644
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -1427,11 +1427,11 @@ static int __devinit sc92031_probe(struct pci_dev *pdev,
 
         pci_set_master(pdev);
 
-        err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (unlikely(err < 0))
                 goto out_set_dma_mask;
 
-        err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+        err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         if (unlikely(err < 0))
                 goto out_set_dma_mask;
 
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index a9732686134b..55ccd51d247e 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -1467,7 +1467,7 @@ static struct net_device * __devinit sis190_init_board(struct pci_dev *pdev)
                 goto err_pci_disable_2;
         }
 
-        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (rc < 0) {
                 net_probe(tp, KERN_ERR "%s: DMA configuration failed.\n",
                           pci_name(pdev));
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 8a70de72ea2c..2d4617b3e208 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -432,7 +432,7 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
         ret = pci_enable_device(pci_dev);
         if(ret) return ret;
 
-        i = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK);
+        i = pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32));
         if(i){
                 printk(KERN_ERR "sis900.c: architecture does not support "
                         "32bit PCI busmaster DMA\n");
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 18a7b662aff1..b8978d4af1b7 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3915,9 +3915,9 @@ static int __devinit skge_probe(struct pci_dev *pdev,
         if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 using_dac = 1;
                 err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
-        } else if (!(err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {
+        } else if (!(err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)))) {
                 using_dac = 0;
-                err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         }
 
         if (err) {
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index da570f44b12b..a2ff9cb1e7ac 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4383,7 +4383,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev,
                         goto err_out_free_regions;
                 }
         } else {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         dev_err(&pdev->dev, "no usable DMA configuration\n");
                         goto err_out_free_regions;
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index 5959ae86e57d..60abdb1081ad 100644
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -1598,7 +1598,7 @@ smsc9420_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 goto out_free_netdev_2;
         }
 
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 printk(KERN_ERR "No usable DMA configuration, aborting.\n");
                 goto out_free_regions_3;
         }
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 2312d10f3b54..d2dfe0ab5106 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -3045,7 +3045,7 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
             !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
                 pci_using_dac = 1;
         } else {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         printk(KERN_ERR PFX "No usable DMA configuration, "
                                "aborting.\n");
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index d77a0918a325..7f4a9683ba1e 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -1945,8 +1945,8 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
             !(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)) ||
-                    (err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))) {
+                if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) ||
+                    (err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)))) {
                         printk(KERN_ERR "tehuti: No usable DMA configuration"
                                         ", aborting\n");
                         goto err_dma;
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h
index 121dda917fdc..4fc875e5dcdd 100644
--- a/drivers/net/tehuti.h
+++ b/drivers/net/tehuti.h
@@ -99,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_32BIT_MASK
-#   define DMA_32BIT_MASK  0x00000000ffffffffULL
-#endif
-
 #ifndef NET_IP_ALIGN
 #   define NET_IP_ALIGN 2
 #endif
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 5ba91d7f7587..6a736dda3ee2 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -13228,7 +13228,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
          * do DMA address check in tg3_start_xmit().
          */
         if (tp->tg3_flags2 & TG3_FLG2_IS_5788)
-                persist_dma_mask = dma_mask = DMA_32BIT_MASK;
+                persist_dma_mask = dma_mask = DMA_BIT_MASK(32);
         else if (tp->tg3_flags & TG3_FLAG_40BIT_DMA_BUG) {
                 persist_dma_mask = dma_mask = DMA_BIT_MASK(40);
 #ifdef CONFIG_HIGHMEM
@@ -13238,7 +13238,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                 persist_dma_mask = dma_mask = DMA_BIT_MASK(64);
 
         /* Configure DMA attributes. */
-        if (dma_mask > DMA_32BIT_MASK) {
+        if (dma_mask > DMA_BIT_MASK(32)) {
                 err = pci_set_dma_mask(pdev, dma_mask);
                 if (!err) {
                         dev->features |= NETIF_F_HIGHDMA;
@@ -13251,8 +13251,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                         }
                 }
         }
-        if (err || dma_mask == DMA_32BIT_MASK) {
-                err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        if (err || dma_mask == DMA_BIT_MASK(32)) {
+                err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (err) {
                         printk(KERN_ERR PFX "No usable DMA configuration, "
                                "aborting.\n");
@@ -13393,7 +13393,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) != 0);
         printk(KERN_INFO "%s: dma_rwctrl[%08x] dma_mask[%d-bit]\n",
                dev->name, tp->dma_rwctrl,
-               (pdev->dma_mask == DMA_32BIT_MASK) ? 32 :
+               (pdev->dma_mask == DMA_BIT_MASK(32)) ? 32 :
                 (((u64) pdev->dma_mask == DMA_BIT_MASK(40)) ? 40 : 64));
 
         return 0;
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 68b967b585aa..aa6964922d5e 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -570,7 +570,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
 
                 priv->adapter = &board_info[ent->driver_data];
 
-                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                 if (rc) {
                         printk(KERN_ERR "TLAN: No suitable PCI mapping available.\n");
                         goto err_out_free_dev;
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index f309b8f703bd..2e70ee8f1459 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -267,7 +267,7 @@ static int __devinit streamer_init_one(struct pci_dev *pdev,
 #endif
 #endif
 
-        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (rc) {
                 printk(KERN_ERR "%s: No suitable PCI mapping available.\n",
                                 dev->name);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index e2c9d0f5a755..f2e669974c78 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -383,7 +383,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
                 return -ENOMEM;
         SET_NETDEV_DEV(dev, &pdev->dev);
 
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 printk(KERN_WARNING DRV_NAME
                         ": 32-bit PCI DMA not available.\n");
                 err = -ENODEV;
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index c227db079621..8761a5a5bd79 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -282,7 +282,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
                 return -ENOMEM;
         SET_NETDEV_DEV(dev, &pdev->dev);
 
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 printk(KERN_WARNING DRV_NAME ": 32-bit PCI DMA not available.\n");
                 err = -ENODEV;
                 goto err_out_free;
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index c61a01b029af..264e61404f34 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -375,7 +375,7 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
 
         irq = pdev->irq;
 
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 printk(KERN_WARNING "Winbond-840: Device %s disabled due to DMA limitations.\n",
                        pci_name(pdev));
                 return -EIO;
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 9dd4f76a2ff5..cf25eb41b1ce 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -2406,7 +2406,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto error_out_disable;
         }
 
-        err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if(err < 0) {
                 printk(ERR_PFX "%s: No usable DMA configuration\n",
                        pci_name(pdev));
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 880eaf07413b..45daba726b66 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -686,7 +686,7 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
                 goto err_out;
 
         /* this should always be supported */
-        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (rc) {
                 printk(KERN_ERR "32-bit PCI DMA addresses not supported by "
                        "the card!?\n");
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index 887acb0dc807..850d70d7b05d 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -633,8 +633,8 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
         /* FIXME when PCI/DMA subsystems are fixed.
            We set both dma_mask and consistent_dma_mask back to 32 bits
            to indicate the card can do 32-bit DMA addressing */
-        if (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK) ||
-            pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)) ||
+            pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 printk(KERN_ERR "wanXL: No usable DMA configuration\n");
                 wanxl_pci_remove_one(pdev);
                 return -EIO;
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index fc0897fb2239..f71821795018 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1804,8 +1804,8 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
                 return err; /* someone else grabbed it? don't disable it */
         }
 
-        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))) {
                 printk(KERN_ERR "%s (adm8211): No suitable DMA available\n",
                        pci_name(pdev));
                 goto err_free_reg;
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 5d57d774e466..a08bc8a4fb69 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -445,7 +445,7 @@ ath5k_pci_probe(struct pci_dev *pdev,
         }
 
         /* XXX 32-bit addressing only */
-        ret = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (ret) {
                 dev_err(&pdev->dev, "32-bit DMA not available\n");
                 goto err_dis;
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index 461d680d2cec..de1964f7d9e0 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -777,7 +777,7 @@ static u64 supported_dma_mask(struct b43_wldev *dev)
         b43_write32(dev, mmio_base + B43_DMA32_TXCTL, B43_DMA32_TXADDREXT_MASK);
         tmp = b43_read32(dev, mmio_base + B43_DMA32_TXCTL);
         if (tmp & B43_DMA32_TXADDREXT_MASK)
-                return DMA_32BIT_MASK;
+                return DMA_BIT_MASK(32);
 
         return DMA_30BIT_MASK;
 }
@@ -786,7 +786,7 @@ static enum b43_dmatype dma_mask_to_engine_type(u64 dmamask)
 {
         if (dmamask == DMA_30BIT_MASK)
                 return B43_DMA_30BIT;
-        if (dmamask == DMA_32BIT_MASK)
+        if (dmamask == DMA_BIT_MASK(32))
                 return B43_DMA_32BIT;
         if (dmamask == DMA_BIT_MASK(64))
                 return B43_DMA_64BIT;
@@ -1000,11 +1000,11 @@ static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask)
                 if (!err)
                         break;
                 if (mask == DMA_BIT_MASK(64)) {
-                        mask = DMA_32BIT_MASK;
+                        mask = DMA_BIT_MASK(32);
                         fallback = 1;
                         continue;
                 }
-                if (mask == DMA_32BIT_MASK) {
+                if (mask == DMA_BIT_MASK(32)) {
                         mask = DMA_30BIT_MASK;
                         fallback = 1;
                         continue;
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
index 61bb91266aa8..1d3e0d239314 100644
--- a/drivers/net/wireless/b43legacy/dma.c
+++ b/drivers/net/wireless/b43legacy/dma.c
@@ -854,7 +854,7 @@ static u64 supported_dma_mask(struct b43legacy_wldev *dev)
         tmp = b43legacy_read32(dev, mmio_base +
                                B43legacy_DMA32_TXCTL);
         if (tmp & B43legacy_DMA32_TXADDREXT_MASK)
-                return DMA_32BIT_MASK;
+                return DMA_BIT_MASK(32);
 
         return DMA_30BIT_MASK;
 }
@@ -863,7 +863,7 @@ static enum b43legacy_dmatype dma_mask_to_engine_type(u64 dmamask)
 {
         if (dmamask == DMA_30BIT_MASK)
                 return B43legacy_DMA_30BIT;
-        if (dmamask == DMA_32BIT_MASK)
+        if (dmamask == DMA_BIT_MASK(32))
                 return B43legacy_DMA_32BIT;
         if (dmamask == DMA_BIT_MASK(64))
                 return B43legacy_DMA_64BIT;
@@ -1043,11 +1043,11 @@ static int b43legacy_dma_set_mask(struct b43legacy_wldev *dev, u64 mask)
                 if (!err)
                         break;
                 if (mask == DMA_BIT_MASK(64)) {
-                        mask = DMA_32BIT_MASK;
+                        mask = DMA_BIT_MASK(32);
                         fallback = 1;
                         continue;
                 }
-                if (mask == DMA_32BIT_MASK) {
+                if (mask == DMA_BIT_MASK(32)) {
                         mask = DMA_30BIT_MASK;
                         fallback = 1;
                         continue;
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index f4e963ba768b..97e5647ff050 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -6207,7 +6207,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
         pci_set_master(pci_dev);
         pci_set_drvdata(pci_dev, priv);
 
-        err = pci_set_dma_mask(pci_dev, DMA_32BIT_MASK);
+        err = pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32));
         if (err) {
                 printk(KERN_WARNING DRV_NAME
                        "Error calling pci_set_dma_mask.\n");
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index e17a4593e1f5..bd4dbcfe1bbe 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11631,9 +11631,9 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
 
         pci_set_master(pdev);
 
-        err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (!err)
-                err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         if (err) {
                 printk(KERN_WARNING DRV_NAME ": No suitable DMA available.\n");
                 goto out_pci_disable_device;
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 9d5f97dd7c73..ce729281ff62 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -4998,9 +4998,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 
         pci_set_master(pdev);
 
-        err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+        err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
         if (!err)
-                err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
+                err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
         if (err) {
                 IWL_WARN(priv, "No suitable DMA available.\n");
                 goto out_pci_disable_device;
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
index 9a72b1e3e163..30876728d7e6 100644
--- a/drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c
@@ -120,7 +120,7 @@ prism54_probe(struct pci_dev *pdev, const struct pci_device_id *id)
         }
 
         /* enable PCI DMA */
-        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
+        if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
                 printk(KERN_ERR "%s: 32-bit PCI DMA not supported", DRV_NAME);
                 goto do_pci_disable_device;
         }
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index e616c20d4a78..43fa0f849003 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -288,7 +288,7 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
         if (pci_set_mwi(pci_dev))
                 ERROR_PROBE("MWI not available.\n");
 
-        if (dma_set_mask(&pci_dev->dev, DMA_32BIT_MASK)) {
+        if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) {
                 ERROR_PROBE("PCI DMA not supported.\n");
                 retval = -EIO;
                 goto exit_disable_device;