diff options
| author | Nicolin Chen <b42378@freescale.com> | 2013-11-12 15:09:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 12:09:23 +0900 |
| commit | 1112b9e2c9c8ae10551a7d34667a6189f971cdba (patch) | |
| tree | 4f8868041498eb6bcd33572757669cd4012580ab | |
| parent | 288342e9cc867421d20f940d0c06b7aa4bf39096 (diff) | |
| download | blackbird-obmc-linux-1112b9e2c9c8ae10551a7d34667a6189f971cdba.tar.gz blackbird-obmc-linux-1112b9e2c9c8ae10551a7d34667a6189f971cdba.zip | |
sound/soc/davinci/davinci-pcm.c: use gen_pool_dma_alloc() in davinci-pcm.c
Since gen_pool_dma_alloc() is introduced, we implement it to simplify code.
Signed-off-by: Nicolin Chen <b42378@freescale.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | sound/soc/davinci/davinci-pcm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/davinci/davinci-pcm.c b/sound/soc/davinci/davinci-pcm.c index 8460edce1c3b..443e9e599a75 100644 --- a/sound/soc/davinci/davinci-pcm.c +++ b/sound/soc/davinci/davinci-pcm.c @@ -267,10 +267,9 @@ static int allocate_sram(struct snd_pcm_substream *substream, return 0; ppcm->period_bytes_max = size; - iram_virt = (void *)gen_pool_alloc(sram_pool, size); + iram_virt = gen_pool_dma_alloc(sram_pool, size, &iram_phys); if (!iram_virt) goto exit1; - iram_phys = gen_pool_virt_to_phys(sram_pool, (unsigned)iram_virt); iram_dma = kzalloc(sizeof(*iram_dma), GFP_KERNEL); if (!iram_dma) goto exit2; |
