projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
684f0d3
)
arch/arm/mach-davinci/sram.c: use gen_pool_dma_alloc() to sram.c
author
Nicolin Chen
<
[email protected]
>
Tue, 12 Nov 2013 23:09:54 +0000
(15:09 -0800)
committer
Linus Torvalds
<
[email protected]
>
Wed, 13 Nov 2013 03:09:22 +0000
(12:09 +0900)
Since gen_pool_dma_alloc() is introduced, we implement it to simplify code.
Signed-off-by: Nicolin Chen <
[email protected]
>
Cc: Sekhar Nori <
[email protected]
>
Cc: Kevin Hilman <
[email protected]
>
Cc: Russell King <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
arch/arm/mach-davinci/sram.c
patch
|
blob
|
history
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);