Merge branch 'topic/kbuild-fixes-for-next' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / arch / arm / mach-davinci / sram.c

diff --git a/arch/arm/mach-davinci/sram.c b/arch/arm/mach-davinci/sram.c
index f18928b073f55de40cfab4d96ea7dd85c606d778..8540dddf1fbd56c2b1894bd0d37098dafc85a366 100644 (file)
--- 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)
 
 void *sram_alloc(size_t len, dma_addr_t *dma)
 {
-       unsigned long vaddr;
        dma_addr_t dma_base = davinci_soc_info.sram_dma;
 
        if (dma)
@@ -33,13 +32,7 @@ void *sram_alloc(size_t len, dma_addr_t *dma)
        if (!sram_pool || (dma && !dma_base))
                return NULL;
 
-       vaddr = gen_pool_alloc(sram_pool, len);
-       if (!vaddr)
-               return NULL;
-
-       if (dma)
-               *dma = gen_pool_virt_to_phys(sram_pool, vaddr);
-       return (void *)vaddr;
+       return gen_pool_dma_alloc(sram_pool, len, dma);
 
 }
 EXPORT_SYMBOL(sram_alloc);