[ARM] 5529/1: davinci: MMC platform support: DMA_32BIT_MASK --> DMA_BIT_MASK(32)
authorKevin Hilman <khilman@deeprootsystems.com>
Fri, 29 May 2009 17:54:14 +0000 (18:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 29 May 2009 18:59:13 +0000 (19:59 +0100)
Some DMA_32BIT_MASK usage snuck in with the MMC platform support.
Convert these to the new preferred DMA_BIT_MASK(32).

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-davinci/devices.c

index c85091c..de16f34 100644 (file)
@@ -62,7 +62,7 @@ void __init davinci_init_i2c(struct davinci_i2c_platform_data *pdata)
 
 #if    defined(CONFIG_MMC_DAVINCI) || defined(CONFIG_MMC_DAVINCI_MODULE)
 
-static u64 mmcsd0_dma_mask = DMA_32BIT_MASK;
+static u64 mmcsd0_dma_mask = DMA_BIT_MASK(32);
 
 static struct resource mmcsd0_resources[] = {
        {
@@ -95,13 +95,13 @@ static struct platform_device davinci_mmcsd0_device = {
        .id = 0,
        .dev = {
                .dma_mask = &mmcsd0_dma_mask,
-               .coherent_dma_mask = DMA_32BIT_MASK,
+               .coherent_dma_mask = DMA_BIT_MASK(32),
        },
        .num_resources = ARRAY_SIZE(mmcsd0_resources),
        .resource = mmcsd0_resources,
 };
 
-static u64 mmcsd1_dma_mask = DMA_32BIT_MASK;
+static u64 mmcsd1_dma_mask = DMA_BIT_MASK(32);
 
 static struct resource mmcsd1_resources[] = {
        {
@@ -132,7 +132,7 @@ static struct platform_device davinci_mmcsd1_device = {
        .id = 1,
        .dev = {
                .dma_mask = &mmcsd1_dma_mask,
-               .coherent_dma_mask = DMA_32BIT_MASK,
+               .coherent_dma_mask = DMA_BIT_MASK(32),
        },
        .num_resources = ARRAY_SIZE(mmcsd1_resources),
        .resource = mmcsd1_resources,