From patchwork Thu Oct 17 17:43:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 3062791 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D02C69F3E2 for ; Thu, 17 Oct 2013 18:09:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C720320456 for ; Thu, 17 Oct 2013 18:09:05 +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 7FEB820268 for ; Thu, 17 Oct 2013 18:09:04 +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 1VWryr-0003Mw-An; Thu, 17 Oct 2013 18:07:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWryJ-0006Ll-2I; Thu, 17 Oct 2013 18:06:55 +0000 Received: from smtp.citrix.com ([66.165.176.89]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VWrxr-0006H5-MV for linux-arm-kernel@lists.infradead.org; Thu, 17 Oct 2013 18:06:28 +0000 X-IronPort-AV: E=Sophos;i="4.93,515,1378857600"; d="scan'208";a="64695383" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 17 Oct 2013 18:05:49 +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; Thu, 17 Oct 2013 14:05:48 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1VWrcf-0005Gf-0h; Thu, 17 Oct 2013 18:44:33 +0100 From: Stefano Stabellini To: Subject: [PATCH v8 14/19] ASoC: Samsung: Rename dma_ops by samsung_dma_ops Date: Thu, 17 Oct 2013 18:43:29 +0100 Message-ID: <1382031814-8782-14-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131017_140627_971570_880EBBE1 X-CRM114-Status: GOOD ( 10.19 ) X-Spam-Score: -7.3 (-------) Cc: Ian.Campbell@citrix.com, konrad.wilk@oracle.com, Stefano Stabellini , Julien Grall , linux-kernel@vger.kernel.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=-4.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 From: Julien Grall 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 Signed-off-by: Stefano Stabellini --- sound/soc/samsung/dma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c index 21b7926..827c0d8 100644 --- a/sound/soc/samsung/dma.c +++ b/sound/soc/samsung/dma.c @@ -341,7 +341,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, @@ -428,7 +428,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, };