arch/arm/mach-davinci/sram.c: use gen_pool_dma_alloc() to sram.c (66f11969) · Commits · 戴 / test

Since gen_pool_dma_alloc() is introduced, we implement it to simplify code. Signed-off-by:

Nicolin Chen <b42378@freescale.com> Cc: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@deeprootsystems.com> Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

arch/arm/mach-davinci/sram.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -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);

Admin message