[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <9536ee2bbb1a8463ebb21068a750b61fa59900df.1383306365.git.b42378@freescale.com>
Date: Fri, 1 Nov 2013 19:48:15 +0800
From: Nicolin Chen <b42378@...escale.com>
To: <akpm@...ux-foundation.org>, <joe@...ches.com>, <nsekhar@...com>,
<khilman@...prootsystems.com>, <linux@....linux.org.uk>,
<dan.j.williams@...el.com>, <vinod.koul@...el.com>,
<m.chehab@...sung.com>, <hjk@...sjkoch.de>,
<gregkh@...uxfoundation.org>, <perex@...ex.cz>, <tiwai@...e.de>,
<lgirdwood@...il.com>, <broonie@...nel.org>,
<rmk+kernel@....linux.org.uk>, <eric.y.miao@...il.com>,
<haojian.zhuang@...il.com>
CC: <linux-kernel@...r.kernel.org>,
<davinci-linux-open-source@...ux.davincidsp.com>,
<linux-arm-kernel@...ts.infradead.org>,
<dmaengine@...r.kernel.org>, <linux-media@...r.kernel.org>,
<alsa-devel@...a-project.org>
Subject: [PATCH][RESEND 2/8] ARM: davinci: use gen_pool_dma_alloc() to sram.c
Since gen_pool_dma_alloc() is introduced, we implement it to simplify code.
Signed-off-by: Nicolin Chen <b42378@...escale.com>
---
arch/arm/mach-davinci/sram.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/arch/arm/mach-davinci/sram.c b/arch/arm/mach-davinci/sram.c
index f18928b..8540ddd 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)
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);
--
1.8.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists