diff options
author | Yang Hongyang <yanghy@cn.fujitsu.com> | 2009-04-06 22:01:13 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 11:31:10 -0400 |
commit | 6a35528a8346f6e6fd32ed7e51f04d1fa4ca2c01 (patch) | |
tree | 9caaf8645b573687bbcf3a16b5aa7dd233fed46e /arch/arm/mach-iop13xx | |
parent | 8a59f5d2526593c6bc1a0754c3a16ccc9ed41ce3 (diff) |
dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)
Replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64)
Signed-off-by: Yang Hongyang<yanghy@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-iop13xx')
-rw-r--r-- | arch/arm/mach-iop13xx/setup.c | 8 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/tpmi.c | 10 |
2 files changed, 9 insertions, 9 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[] = { | |||
307 | } | 307 | } |
308 | }; | 308 | }; |
309 | 309 | ||
310 | static u64 iop13xx_adma_dmamask = DMA_64BIT_MASK; | 310 | static u64 iop13xx_adma_dmamask = DMA_BIT_MASK(64); |
311 | static struct iop_adma_platform_data iop13xx_adma_0_data = { | 311 | static struct iop_adma_platform_data iop13xx_adma_0_data = { |
312 | .hw_id = 0, | 312 | .hw_id = 0, |
313 | .pool_size = PAGE_SIZE, | 313 | .pool_size = PAGE_SIZE, |
@@ -331,7 +331,7 @@ static struct platform_device iop13xx_adma_0_channel = { | |||
331 | .resource = iop13xx_adma_0_resources, | 331 | .resource = iop13xx_adma_0_resources, |
332 | .dev = { | 332 | .dev = { |
333 | .dma_mask = &iop13xx_adma_dmamask, | 333 | .dma_mask = &iop13xx_adma_dmamask, |
334 | .coherent_dma_mask = DMA_64BIT_MASK, | 334 | .coherent_dma_mask = DMA_BIT_MASK(64), |
335 | .platform_data = (void *) &iop13xx_adma_0_data, | 335 | .platform_data = (void *) &iop13xx_adma_0_data, |
336 | }, | 336 | }, |
337 | }; | 337 | }; |
@@ -343,7 +343,7 @@ static struct platform_device iop13xx_adma_1_channel = { | |||
343 | .resource = iop13xx_adma_1_resources, | 343 | .resource = iop13xx_adma_1_resources, |
344 | .dev = { | 344 | .dev = { |
345 | .dma_mask = &iop13xx_adma_dmamask, | 345 | .dma_mask = &iop13xx_adma_dmamask, |
346 | .coherent_dma_mask = DMA_64BIT_MASK, | 346 | .coherent_dma_mask = DMA_BIT_MASK(64), |
347 | .platform_data = (void *) &iop13xx_adma_1_data, | 347 | .platform_data = (void *) &iop13xx_adma_1_data, |
348 | }, | 348 | }, |
349 | }; | 349 | }; |
@@ -355,7 +355,7 @@ static struct platform_device iop13xx_adma_2_channel = { | |||
355 | .resource = iop13xx_adma_2_resources, | 355 | .resource = iop13xx_adma_2_resources, |
356 | .dev = { | 356 | .dev = { |
357 | .dma_mask = &iop13xx_adma_dmamask, | 357 | .dma_mask = &iop13xx_adma_dmamask, |
358 | .coherent_dma_mask = DMA_64BIT_MASK, | 358 | .coherent_dma_mask = DMA_BIT_MASK(64), |
359 | .platform_data = (void *) &iop13xx_adma_2_data, | 359 | .platform_data = (void *) &iop13xx_adma_2_data, |
360 | }, | 360 | }, |
361 | }; | 361 | }; |
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[] = { | |||
151 | } | 151 | } |
152 | }; | 152 | }; |
153 | 153 | ||
154 | u64 iop13xx_tpmi_mask = DMA_64BIT_MASK; | 154 | u64 iop13xx_tpmi_mask = DMA_BIT_MASK(64); |
155 | static struct platform_device iop13xx_tpmi_0_device = { | 155 | static struct platform_device iop13xx_tpmi_0_device = { |
156 | .name = "iop-tpmi", | 156 | .name = "iop-tpmi", |
157 | .id = 0, | 157 | .id = 0, |
@@ -159,7 +159,7 @@ static struct platform_device iop13xx_tpmi_0_device = { | |||
159 | .resource = iop13xx_tpmi_0_resources, | 159 | .resource = iop13xx_tpmi_0_resources, |
160 | .dev = { | 160 | .dev = { |
161 | .dma_mask = &iop13xx_tpmi_mask, | 161 | .dma_mask = &iop13xx_tpmi_mask, |
162 | .coherent_dma_mask = DMA_64BIT_MASK, | 162 | .coherent_dma_mask = DMA_BIT_MASK(64), |
163 | }, | 163 | }, |
164 | }; | 164 | }; |
165 | 165 | ||
@@ -170,7 +170,7 @@ static struct platform_device iop13xx_tpmi_1_device = { | |||
170 | .resource = iop13xx_tpmi_1_resources, | 170 | .resource = iop13xx_tpmi_1_resources, |
171 | .dev = { | 171 | .dev = { |
172 | .dma_mask = &iop13xx_tpmi_mask, | 172 | .dma_mask = &iop13xx_tpmi_mask, |
173 | .coherent_dma_mask = DMA_64BIT_MASK, | 173 | .coherent_dma_mask = DMA_BIT_MASK(64), |
174 | }, | 174 | }, |
175 | }; | 175 | }; |
176 | 176 | ||
@@ -181,7 +181,7 @@ static struct platform_device iop13xx_tpmi_2_device = { | |||
181 | .resource = iop13xx_tpmi_2_resources, | 181 | .resource = iop13xx_tpmi_2_resources, |
182 | .dev = { | 182 | .dev = { |
183 | .dma_mask = &iop13xx_tpmi_mask, | 183 | .dma_mask = &iop13xx_tpmi_mask, |
184 | .coherent_dma_mask = DMA_64BIT_MASK, | 184 | .coherent_dma_mask = DMA_BIT_MASK(64), |
185 | }, | 185 | }, |
186 | }; | 186 | }; |
187 | 187 | ||
@@ -192,7 +192,7 @@ static struct platform_device iop13xx_tpmi_3_device = { | |||
192 | .resource = iop13xx_tpmi_3_resources, | 192 | .resource = iop13xx_tpmi_3_resources, |
193 | .dev = { | 193 | .dev = { |
194 | .dma_mask = &iop13xx_tpmi_mask, | 194 | .dma_mask = &iop13xx_tpmi_mask, |
195 | .coherent_dma_mask = DMA_64BIT_MASK, | 195 | .coherent_dma_mask = DMA_BIT_MASK(64), |
196 | }, | 196 | }, |
197 | }; | 197 | }; |
198 | 198 | ||