aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r--arch/arm/mach-davinci/sram.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-davinci/sram.c b/arch/arm/mach-davinci/sram.c
index f18928b073f5..8540dddf1fbd 100644
--- a/arch/arm/mach-davinci/sram.c
+++ b/arch/arm/mach-davinci/sram.c
@@ -25,7 +25,6 @@ struct gen_pool *sram_get_gen_pool(void)
25 25
26void *sram_alloc(size_t len, dma_addr_t *dma) 26void *sram_alloc(size_t len, dma_addr_t *dma)
27{ 27{
28 unsigned long vaddr;
29 dma_addr_t dma_base = davinci_soc_info.sram_dma; 28 dma_addr_t dma_base = davinci_soc_info.sram_dma;
30 29
31 if (dma) 30 if (dma)
@@ -33,13 +32,7 @@ void *sram_alloc(size_t len, dma_addr_t *dma)
33 if (!sram_pool || (dma && !dma_base)) 32 if (!sram_pool || (dma && !dma_base))
34 return NULL; 33 return NULL;
35 34
36 vaddr = gen_pool_alloc(sram_pool, len); 35 return gen_pool_dma_alloc(sram_pool, len, dma);
37 if (!vaddr)
38 return NULL;
39
40 if (dma)
41 *dma = gen_pool_virt_to_phys(sram_pool, vaddr);
42 return (void *)vaddr;
43 36
44} 37}
45EXPORT_SYMBOL(sram_alloc); 38EXPORT_SYMBOL(sram_alloc);