7 files changed, 20 insertions, 20 deletions

diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index cfd4d2e6dacd..bee42c609df6 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -307,7 +307,7 @@ static struct resource iop13xx_adma_2_resources[] = {
         }
 };
 
-static u64 iop13xx_adma_dmamask = DMA_64BIT_MASK;
+static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64);
 static struct iop_adma_platform_data iop13xx_adma_0_data = {
         .hw_id = 0,
         .pool_size = PAGE_SIZE,
@@ -331,7 +331,7 @@ static struct platform_device iop13xx_adma_0_channel = {
         .resource = iop13xx_adma_0_resources,
         .dev = {
                 .dma_mask = &iop13xx_adma_dmamask,
-                .coherent_dma_mask = DMA_64BIT_MASK,
+                .coherent_dma_mask = DMA_BIT_MASK(64),
                 .platform_data = (void *) &iop13xx_adma_0_data,
         },
 };
@@ -343,7 +343,7 @@ static struct platform_device iop13xx_adma_1_channel = {
         .resource = iop13xx_adma_1_resources,
         .dev = {
                 .dma_mask = &iop13xx_adma_dmamask,
-                .coherent_dma_mask = DMA_64BIT_MASK,
+                .coherent_dma_mask = DMA_BIT_MASK(64),
                 .platform_data = (void *) &iop13xx_adma_1_data,
         },
 };
@@ -355,7 +355,7 @@ static struct platform_device iop13xx_adma_2_channel = {
         .resource = iop13xx_adma_2_resources,
         .dev = {
                 .dma_mask = &iop13xx_adma_dmamask,
-                .coherent_dma_mask = DMA_64BIT_MASK,
+                .coherent_dma_mask = DMA_BIT_MASK(64),
                 .platform_data = (void *) &iop13xx_adma_2_data,
         },
 };
diff --git a/arch/arm/mach-iop13xx/tpmi.c b/arch/arm/mach-iop13xx/tpmi.c
index c6af1e1bee32..6fdad7a0425a 100644
--- a/arch/arm/mach-iop13xx/tpmi.c
+++ b/arch/arm/mach-iop13xx/tpmi.c
@@ -151,7 +151,7 @@ static struct resource iop13xx_tpmi_3_resources[] = {
         }
 };
 
-u64 iop13xx_tpmi_mask = DMA_64BIT_MASK;
+u64 iop13xx_tpmi_mask = DMA_BIT_MASK(64);
 static struct platform_device iop13xx_tpmi_0_device = {
         .name = "iop-tpmi",
         .id = 0,
@@ -159,7 +159,7 @@ static struct platform_device iop13xx_tpmi_0_device = {
         .resource = iop13xx_tpmi_0_resources,
         .dev = {
                 .dma_mask          = &iop13xx_tpmi_mask,
-                .coherent_dma_mask = DMA_64BIT_MASK,
+                .coherent_dma_mask = DMA_BIT_MASK(64),
         },
 };
 
@@ -170,7 +170,7 @@ static struct platform_device iop13xx_tpmi_1_device = {
         .resource = iop13xx_tpmi_1_resources,
         .dev = {
                 .dma_mask          = &iop13xx_tpmi_mask,
-                .coherent_dma_mask = DMA_64BIT_MASK,
+                .coherent_dma_mask = DMA_BIT_MASK(64),
         },
 };
 
@@ -181,7 +181,7 @@ static struct platform_device iop13xx_tpmi_2_device = {
         .resource = iop13xx_tpmi_2_resources,
         .dev = {
                 .dma_mask          = &iop13xx_tpmi_mask,
-                .coherent_dma_mask = DMA_64BIT_MASK,
+                .coherent_dma_mask = DMA_BIT_MASK(64),
         },
 };
 
@@ -192,7 +192,7 @@ static struct platform_device iop13xx_tpmi_3_device = {
         .resource = iop13xx_tpmi_3_resources,
         .dev = {
                 .dma_mask          = &iop13xx_tpmi_mask,
-                .coherent_dma_mask = DMA_64BIT_MASK,
+                .coherent_dma_mask = DMA_BIT_MASK(64),
         },
 };
 
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 3d2fae846512..c691848714d9 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -559,7 +559,7 @@ static struct platform_device kirkwood_xor00_channel = {
         .resource       = kirkwood_xor00_resources,
         .dev            = {
                 .dma_mask               = &kirkwood_xor_dmamask,
-                .coherent_dma_mask      = DMA_64BIT_MASK,
+                .coherent_dma_mask      = DMA_BIT_MASK(64),
                 .platform_data          = (void *)&kirkwood_xor00_data,
         },
 };
@@ -585,7 +585,7 @@ static struct platform_device kirkwood_xor01_channel = {
         .resource       = kirkwood_xor01_resources,
         .dev            = {
                 .dma_mask               = &kirkwood_xor_dmamask,
-                .coherent_dma_mask      = DMA_64BIT_MASK,
+                .coherent_dma_mask      = DMA_BIT_MASK(64),
                 .platform_data          = (void *)&kirkwood_xor01_data,
         },
 };
@@ -657,7 +657,7 @@ static struct platform_device kirkwood_xor10_channel = {
         .resource       = kirkwood_xor10_resources,
         .dev            = {
                 .dma_mask               = &kirkwood_xor_dmamask,
-                .coherent_dma_mask      = DMA_64BIT_MASK,
+                .coherent_dma_mask      = DMA_BIT_MASK(64),
                 .platform_data          = (void *)&kirkwood_xor10_data,
         },
 };
@@ -683,7 +683,7 @@ static struct platform_device kirkwood_xor11_channel = {
         .resource       = kirkwood_xor11_resources,
         .dev            = {
                 .dma_mask               = &kirkwood_xor_dmamask,
-                .coherent_dma_mask      = DMA_64BIT_MASK,
+                .coherent_dma_mask      = DMA_BIT_MASK(64),
                 .platform_data          = (void *)&kirkwood_xor11_data,
         },
 };
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 68cc3efae567..e8d42e8cb465 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -486,7 +486,7 @@ static struct platform_device orion5x_xor0_channel = {
         .resource       = orion5x_xor0_resources,
         .dev            = {
                 .dma_mask               = &orion5x_xor_dmamask,
-                .coherent_dma_mask      = DMA_64BIT_MASK,
+                .coherent_dma_mask      = DMA_BIT_MASK(64),
                 .platform_data          = (void *)&orion5x_xor0_data,
         },
 };
@@ -512,7 +512,7 @@ static struct platform_device orion5x_xor1_channel = {
         .resource       = orion5x_xor1_resources,
         .dev            = {
                 .dma_mask               = &orion5x_xor_dmamask,
-                .coherent_dma_mask      = DMA_64BIT_MASK,
+                .coherent_dma_mask      = DMA_BIT_MASK(64),
                 .platform_data          = (void *)&orion5x_xor1_data,
         },
 };
diff --git a/arch/arm/plat-iop/adma.c b/arch/arm/plat-iop/adma.c
index f72420821619..a2a94f6d2e7c 100644
--- a/arch/arm/plat-iop/adma.c
+++ b/arch/arm/plat-iop/adma.c
@@ -143,7 +143,7 @@ struct platform_device iop3xx_dma_0_channel = {
         .resource = iop3xx_dma_0_resources,
         .dev = {
                 .dma_mask = &iop3xx_adma_dmamask,
-                .coherent_dma_mask = DMA_64BIT_MASK,
+                .coherent_dma_mask = DMA_BIT_MASK(64),
                 .platform_data = (void *) &iop3xx_dma_0_data,
         },
 };
@@ -155,7 +155,7 @@ struct platform_device iop3xx_dma_1_channel = {
         .resource = iop3xx_dma_1_resources,
         .dev = {
                 .dma_mask = &iop3xx_adma_dmamask,
-                .coherent_dma_mask = DMA_64BIT_MASK,
+                .coherent_dma_mask = DMA_BIT_MASK(64),
                 .platform_data = (void *) &iop3xx_dma_1_data,
         },
 };
@@ -167,7 +167,7 @@ struct platform_device iop3xx_aau_channel = {
         .resource = iop3xx_aau_resources,
         .dev = {
                 .dma_mask = &iop3xx_adma_dmamask,
-                .coherent_dma_mask = DMA_64BIT_MASK,
+                .coherent_dma_mask = DMA_BIT_MASK(64),
                 .platform_data = (void *) &iop3xx_aau_data,
         },
 };
diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
index 8c130e8f00e1..d876423e4e75 100644
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
@@ -349,7 +349,7 @@ static int sn_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 
 u64 sn_dma_get_required_mask(struct device *dev)
 {
-        return DMA_64BIT_MASK;
+        return DMA_BIT_MASK(64);
 }
 EXPORT_SYMBOL_GPL(sn_dma_get_required_mask);
 
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 5744527a7f2a..bed4690de394 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -644,7 +644,7 @@ static void dma_fixed_unmap_sg(struct device *dev, struct scatterlist *sg,
 
 static int dma_fixed_dma_supported(struct device *dev, u64 mask)
 {
-        return mask == DMA_64BIT_MASK;
+        return mask == DMA_BIT_MASK(64);
 }
 
 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);