From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752995AbdFPIuB (ORCPT ); Fri, 16 Jun 2017 04:50:01 -0400 Received: from mx2.suse.de ([195.135.220.15]:42271 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752170AbdFPIt7 (ORCPT ); Fri, 16 Jun 2017 04:49:59 -0400 Date: Fri, 16 Jun 2017 10:49:56 +0200 Message-ID: From: Takashi Iwai To: Christoph Hellwig Cc: linux-scsi@vger.kernel.org, linux-serial@vger.kernel.org, netdev@vger.kernel.org, linux-metag@vger.kernel.org, nios2-dev@lists.rocketboards.org, linux-fbdev@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [alsa-devel] [PATCH 04/11] sound/hal2: switch to dma_alloc_attrs In-Reply-To: <20170616071716.17321-5-hch@lst.de> References: <20170616071716.17321-1-hch@lst.de> <20170616071716.17321-5-hch@lst.de> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 16 Jun 2017 09:17:09 +0200, Christoph Hellwig wrote: > > Use dma_alloc_attrs directly instead of the dma_alloc_noncoherent wrapper. > > Signed-off-by: Christoph Hellwig Should I take this one through sound git tree, or would you prefer taking all through another? In the latter case, Reviewed-by: Takashi Iwai thanks, Takashi > --- > sound/mips/hal2.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c > index 00fc9241d266..17a78a93e885 100644 > --- a/sound/mips/hal2.c > +++ b/sound/mips/hal2.c > @@ -461,15 +461,15 @@ static int hal2_alloc_dmabuf(struct hal2_codec *codec) > int count = H2_BUF_SIZE / H2_BLOCK_SIZE; > int i; > > - codec->buffer = dma_alloc_noncoherent(NULL, H2_BUF_SIZE, > - &buffer_dma, GFP_KERNEL); > + codec->buffer = dma_alloc_attrs(NULL, H2_BUF_SIZE, &buffer_dma, > + GFP_KERNEL, DMA_ATTR_NON_CONSISTENT); > if (!codec->buffer) > return -ENOMEM; > - desc = dma_alloc_noncoherent(NULL, count * sizeof(struct hal2_desc), > - &desc_dma, GFP_KERNEL); > + desc = dma_alloc_attrs(NULL, count * sizeof(struct hal2_desc), > + &desc_dma, GFP_KERNEL, DMA_ATTR_NON_CONSISTENT); > if (!desc) { > - dma_free_noncoherent(NULL, H2_BUF_SIZE, > - codec->buffer, buffer_dma); > + dma_free_attrs(NULL, H2_BUF_SIZE, codec->buffer, buffer_dma, > + DMA_ATTR_NON_CONSISTENT); > return -ENOMEM; > } > codec->buffer_dma = buffer_dma; > @@ -490,10 +490,10 @@ static int hal2_alloc_dmabuf(struct hal2_codec *codec) > > static void hal2_free_dmabuf(struct hal2_codec *codec) > { > - dma_free_noncoherent(NULL, codec->desc_count * sizeof(struct hal2_desc), > - codec->desc, codec->desc_dma); > - dma_free_noncoherent(NULL, H2_BUF_SIZE, codec->buffer, > - codec->buffer_dma); > + dma_free_attrs(NULL, codec->desc_count * sizeof(struct hal2_desc), > + codec->desc, codec->desc_dma, DMA_ATTR_NON_CONSISTENT); > + dma_free_attrs(NULL, H2_BUF_SIZE, codec->buffer, codec->buffer_dma, > + DMA_ATTR_NON_CONSISTENT); > } > > static struct snd_pcm_hardware hal2_pcm_hw = { > -- > 2.11.0 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >