]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
sound/soc/davinci/davinci-pcm.c: use gen_pool_dma_alloc() in davinci-pcm.c
authorNicolin Chen <b42378@freescale.com>
Tue, 12 Nov 2013 23:09:58 +0000 (15:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 03:09:23 +0000 (12:09 +0900)
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>
sound/soc/davinci/davinci-pcm.c

index 8460edce1c3b6b5cc90dff481e5588c75e2285ad..443e9e599a7583c0992162084cec77bd2b4b102a 100644 (file)
@@ -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;