9 files changed, 18 insertions, 18 deletions

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;