From patchwork Thu Sep 27 22:39:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 147750 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp6429lji; Thu, 27 Sep 2018 15:40:07 -0700 (PDT) X-Google-Smtp-Source: ACcGV62Q97zrFwLpR/JbX0SkzsMu9E9v1+4Q7sC7urygzwBBlRwQVrIVAzKWMs1z4Pu3jmh3NrfQ X-Received: by 2002:a5d:63c4:: with SMTP id c4-v6mr10166588wrw.106.1538088007768; Thu, 27 Sep 2018 15:40:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538088007; cv=none; d=google.com; s=arc-20160816; b=x2aYPkBsx1pahtGrS6YiuptZLOs9q6UQk0ZZ7SOzOFsZf4o+DdOOfg8ab7agZpJ4M+ PenqbpqMeO4Vnu4xUhP83c9EI4syqa2K8Zq9A7mH7a6quUUX0KUTWs7peVD7IRKE0Rma oCpHSKXJfHxaX5zqVdGAUidYZhI+OJ01PtXUr6IB0fE0ZiHymCREDmM6A7nSpIXlIOUh ltnLM+vluSJivm2IpO2iYWeT4zpSUdzsRx7Cc5AdHTpSymoWY9+HpRqi1Jo0EvAZ6x5V A6UAIXXxW7r1iDKf2sDjNMbyYtq61RjKEA/UyVpPYATJtEoN2b9C+ySmrWGnXkZczp95 JHFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=Jixi/9RX0dZKtQM3Z1zI2lHO2FFlMmDAJ4sdVkaX6uU=; b=qp62SfYI3uLZUzGcu9jeXzGXx7eTdd9ZL1HgJOMZWJWZDXdYHd0W1viTHPmD21hH3T /8mtLGIRJkYt4cppNC9fEqGk6qwPNeQCFDAuyJ8uRh27R3ZiheDAJpbxnC8OQo3DcPBr euFD/rdRN2eFBPMnbxtfnidiszFF2pha+yz1d1QsBX8bZwMhlgJVsoaxyiyC7a22C8c7 pFfY3Ti5qIB1Ll2QB0ZO+Po8PEwH0WFJqFe9qVB9v6Qw8rLY5oADbbtmJ30fERyTsqOx jYDJIXVpo7KiJvEy0xz8TdT57GZZtGMD6q8NMmqoUL357LON8RDTDlcXXX2eK4Wd+8bX Z3HQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=wE9humTr; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id n2-v6si2993974wrx.302.2018.09.27.15.40.07; Thu, 27 Sep 2018 15:40:07 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=wE9humTr; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 6CD8D2678E5; Fri, 28 Sep 2018 00:40:03 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 9ED232678EE; Fri, 28 Sep 2018 00:40:01 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id E53722678CD for ; Fri, 28 Sep 2018 00:39:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=VU3brhnZVJ+dOVrIdCaYanDrEvVvg92lfT59BDKyIHk=; b=wE9humTrG91l 38qz+UgvPp0bQ95N+g/0XBkzwemERA9HBwc5ux1EyuTGqpxllmpRTtpomxGGNEYQXkhUhubGmRoYT Ci2/djeKXbnRYlIZgad4MW2eZxqmD9dRWUUnprEQRp0qO/S9/oYxJUpgLBUhFQZVZFZ4V67YjaO1V ZDLiQ=; Received: from [2001:470:1f1d:6b5:7e7a:91ff:fede:4a45] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1g5ewx-0007Tc-Cg; Thu, 27 Sep 2018 22:39:59 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id E7816440078; Thu, 27 Sep 2018 23:39:58 +0100 (BST) From: Mark Brown To: Matthias Kaehlcke In-Reply-To: <20180925180914.193244-1-mka@chromium.org> Message-Id: <20180927223958.E7816440078@finisterre.ee.mobilebroadband> Date: Thu, 27 Sep 2018 23:39:58 +0100 (BST) Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Takashi Iwai , Liam Girdwood , Andy Shevchenko , Mark Brown Subject: [alsa-devel] Applied "ASoC: soc-utils: Rename dummy_dma_ops to snd_dummy_dma_ops" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: soc-utils: Rename dummy_dma_ops to snd_dummy_dma_ops has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 42cfb412e24ffbb46d6de9590293bc44f921a0fb Mon Sep 17 00:00:00 2001 From: Matthias Kaehlcke Date: Tue, 25 Sep 2018 11:09:14 -0700 Subject: [PATCH] ASoC: soc-utils: Rename dummy_dma_ops to snd_dummy_dma_ops The symbols 'dummy_dma_ops' is declared with different data types by sound/soc/soc-utils.c and arch/arm64/include/asm/dma-mapping.h. This leads to conflicts when soc-utils.c (indirectly) includes dma-mapping.h: sound/soc/soc-utils.c:282:33: error: conflicting types for 'dummy_dma_ops' static const struct snd_pcm_ops dummy_dma_ops = { ^ ... arch/arm64/include/asm/dma-mapping.h:27:33: note: previous declaration of 'dummy_dma_ops' was here extern const struct dma_map_ops dummy_dma_ops; ^ Rename the symbol in soc-utils.c to 'snd_dummy_dma_ops' to avoid the conflict. Signed-off-by: Matthias Kaehlcke Signed-off-by: Mark Brown --- sound/soc/soc-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.19.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index e0c93496c0cd..e3b9dd634c6d 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c @@ -273,13 +273,13 @@ static int dummy_dma_open(struct snd_pcm_substream *substream) return 0; } -static const struct snd_pcm_ops dummy_dma_ops = { +static const struct snd_pcm_ops snd_dummy_dma_ops = { .open = dummy_dma_open, .ioctl = snd_pcm_lib_ioctl, }; static const struct snd_soc_component_driver dummy_platform = { - .ops = &dummy_dma_ops, + .ops = &snd_dummy_dma_ops, }; static const struct snd_soc_component_driver dummy_codec = {