From patchwork Mon Sep 2 14:45:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 2852883 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E6664C0AB5 for ; Mon, 2 Sep 2013 14:45:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C9C9F201D3 for ; Mon, 2 Sep 2013 14:45:52 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C1D26201BF for ; Mon, 2 Sep 2013 14:45:51 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VGVNy-0001Cb-KY; Mon, 02 Sep 2013 14:45:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VGVNs-00010X-GM; Mon, 02 Sep 2013 14:45:40 +0000 Received: from smtp02.citrix.com ([66.165.176.63]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VGVNq-0000ys-6I for linux-arm-kernel@lists.infradead.org; Mon, 02 Sep 2013 14:45:39 +0000 X-IronPort-AV: E=Sophos;i="4.89,1007,1367971200"; d="scan'208";a="47359287" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 02 Sep 2013 14:45:15 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Mon, 2 Sep 2013 10:45:14 -0400 Received: from chilopoda.uk.xensource.com ([10.80.2.139]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1VGVNS-0004x0-Ly; Mon, 02 Sep 2013 15:45:14 +0100 Message-ID: <5224A47A.3010704@citrix.com> Date: Mon, 2 Sep 2013 15:45:14 +0100 From: Julien Grall User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130828 Icedove/17.0.8 MIME-Version: 1.0 To: Stefano Stabellini Subject: Re: [Xen-devel] [PATCH v5 02/13] arm: introduce a global dma_ops pointer References: <1377801154-29215-2-git-send-email-stefano.stabellini@eu.citrix.com> In-Reply-To: <1377801154-29215-2-git-send-email-stefano.stabellini@eu.citrix.com> X-DLP: MIA2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130902_104538_346611_FF792BBC X-CRM114-Status: GOOD ( 15.52 ) X-Spam-Score: -5.0 (-----) Cc: xen-devel@lists.xensource.com, linux@arm.linux.org.uk, Ian.Campbell@citrix.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com, ben-linux@fluff.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 08/29/2013 07:32 PM, Stefano Stabellini wrote: > Initially set dma_ops to arm_dma_ops. > > > Signed-off-by: Stefano Stabellini > Acked-by: Konrad Rzeszutek Wilk > CC: will.deacon@arm.com > CC: linux@arm.linux.org.uk > > > Changes in v3: > - keep using arm_dma_ops in dmabounce. > --- > arch/arm/include/asm/dma-mapping.h | 3 ++- > arch/arm/mm/dma-mapping.c | 3 +++ > 2 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h > index 0982206..7d6e4f9 100644 > --- a/arch/arm/include/asm/dma-mapping.h > +++ b/arch/arm/include/asm/dma-mapping.h > @@ -13,6 +13,7 @@ > #include > > #define DMA_ERROR_CODE (~0) > +extern struct dma_map_ops *dma_ops; Hi, I tried to build your swiotlb patch series for the Arndale. I have a compilation error because dma_ops is already used in samsung sound driver (sound/soc/samsung/dma.c). This small fix allow me to built this serie for the Arndale. Do I need to send it separately? ======================================================================= commit 73d4ceded87f52fa958b92d8d8d65be485e90857 Author: Julien Grall Date: Mon Sep 2 15:36:35 2013 +0100 ASoC: Samsung: Rename dma_ops by samsung_dma_ops The commit "arm: introduce a global dma_ops pointer" introduce compilation issue when CONFIG_SND_SOC_SAMSUNG is enabled. sound/soc/samsung/dma.c:345:27: error: conflicting types for 'dma_ops' /local/home/julien/works/arndale/linux/arch/arm/include/asm/dma-mapping.h:16:28: note: previous declaration of 'dma_ops' was here Signed-off-by: Julien Grall diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c index ddea134..c341603 100644 --- a/sound/soc/samsung/dma.c +++ b/sound/soc/samsung/dma.c @@ -342,7 +342,7 @@ static int dma_mmap(struct snd_pcm_substream *substream, runtime->dma_bytes); } -static struct snd_pcm_ops dma_ops = { +static struct snd_pcm_ops samsung_dma_ops = { .open = dma_open, .close = dma_close, .ioctl = snd_pcm_lib_ioctl, @@ -429,7 +429,7 @@ out: } static struct snd_soc_platform_driver samsung_asoc_platform = { - .ops = &dma_ops, + .ops = &samsung_dma_ops, .pcm_new = dma_new, .pcm_free = dma_free_dma_buffers, };