diff options
| author | Kevin Hilman <khilman@deeprootsystems.com> | 2009-05-29 19:54:14 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-29 20:59:13 +0200 |
| commit | b0958aed1ea39825439a7848544bfb2e267273b4 (patch) | |
| tree | 32a25d648072dcef6ceeef2d8217b8c95ec5bfca /arch/arm/mach-davinci/devices.c | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khil... (diff) | |
| download | linux-b0958aed1ea39825439a7848544bfb2e267273b4.tar.xz linux-b0958aed1ea39825439a7848544bfb2e267273b4.zip | |
[ARM] 5529/1: davinci: MMC platform support: DMA_32BIT_MASK --> DMA_BIT_MASK(32)
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>
Diffstat (limited to 'arch/arm/mach-davinci/devices.c')
| -rw-r--r-- | arch/arm/mach-davinci/devices.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c index c85091c25d11..de16f347566a 100644 --- a/arch/arm/mach-davinci/devices.c +++ b/arch/arm/mach-davinci/devices.c @@ -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, |