summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorNicolin Chen <b42378@freescale.com>2013-11-12 15:10:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 12:09:23 +0900
commit92a2e1cb53ba649e620b7f02a15ad1fb949c6355 (patch)
tree2556276630f2f65d89c46faf659fc26a7a271274 /sound/soc
parent1112b9e2c9c8ae10551a7d34667a6189f971cdba (diff)
downloadop-kernel-dev-92a2e1cb53ba649e620b7f02a15ad1fb949c6355.zip
op-kernel-dev-92a2e1cb53ba649e620b7f02a15ad1fb949c6355.tar.gz
sound/soc/pxa/mmp-pcm.c: use gen_pool_dma_alloc() to allocate dma buffer
Since gen_pool_dma_alloc() is introduced, we implement it to simplify code. Signed-off-by: Nicolin Chen <b42378@freescale.com> Cc: Eric Miao <eric.y.miao@gmail.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Haojian Zhuang <haojian.zhuang@gmail.com> Cc: Liam Girdwood <lgirdwood@gmail.com> Cc: Mark Brown <broonie@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/pxa/mmp-pcm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c
index 8235e23..7929e19 100644
--- a/sound/soc/pxa/mmp-pcm.c
+++ b/sound/soc/pxa/mmp-pcm.c
@@ -201,10 +201,9 @@ static int mmp_pcm_preallocate_dma_buffer(struct snd_pcm_substream *substream,
if (!gpool)
return -ENOMEM;
- buf->area = (unsigned char *)gen_pool_alloc(gpool, size);
+ buf->area = gen_pool_dma_alloc(gpool, size, &buf->addr);
if (!buf->area)
return -ENOMEM;
- buf->addr = gen_pool_virt_to_phys(gpool, (unsigned long)buf->area);
buf->bytes = size;
return 0;
}
OpenPOWER on IntegriCloud