Subject: [merged] sound-core-memallocc-use-gen_pool_dma_alloc-to-allocate-iram-buffer.patch removed from -mm tree To: b42378@xxxxxxxxxxxxx,tiwai@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 15 Nov 2013 12:09:27 -0800 The patch titled Subject: sound/core/memalloc.c: use gen_pool_dma_alloc() to allocate iram buffer has been removed from the -mm tree. Its filename was sound-core-memallocc-use-gen_pool_dma_alloc-to-allocate-iram-buffer.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Nicolin Chen <b42378@xxxxxxxxxxxxx> Subject: sound/core/memalloc.c: use gen_pool_dma_alloc() to allocate iram buffer Since gen_pool_dma_alloc() is introduced, we implement it to simplify code. Signed-off-by: Nicolin Chen <b42378@xxxxxxxxxxxxx> Acked-by: Takashi Iwai <tiwai@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- sound/core/memalloc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff -puN sound/core/memalloc.c~sound-core-memallocc-use-gen_pool_dma_alloc-to-allocate-iram-buffer sound/core/memalloc.c --- a/sound/core/memalloc.c~sound-core-memallocc-use-gen_pool_dma_alloc-to-allocate-iram-buffer +++ a/sound/core/memalloc.c @@ -184,11 +184,7 @@ static void snd_malloc_dev_iram(struct s /* Assign the pool into private_data field */ dmab->private_data = pool; - dmab->area = (void *)gen_pool_alloc(pool, size); - if (!dmab->area) - return; - - dmab->addr = gen_pool_virt_to_phys(pool, (unsigned long)dmab->area); + dmab->area = gen_pool_dma_alloc(pool, size, &dmab->addr); } /** _ Patches currently in -mm which might be from b42378@xxxxxxxxxxxxx are origin.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html