From patchwork Tue Sep 25 18:09:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10614709 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 826A717E0 for ; Tue, 25 Sep 2018 19:26:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70B7C2AB52 for ; Tue, 25 Sep 2018 19:26:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6412E2AB54; Tue, 25 Sep 2018 19:26:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D8482AB39 for ; Tue, 25 Sep 2018 19:26:10 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 8E01C2678AA; Tue, 25 Sep 2018 20:09:35 +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 881792678AD; Tue, 25 Sep 2018 20:09:33 +0200 (CEST) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by alsa0.perex.cz (Postfix) with ESMTP id 62B8B267892 for ; Tue, 25 Sep 2018 20:09:31 +0200 (CEST) Received: by mail-pf1-f194.google.com with SMTP id x17-v6so11767967pfh.5 for ; Tue, 25 Sep 2018 11:09:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CvRiYuhYnuR651Mppw8za9+8AfZcjBxds0GLMWI0OQ0=; b=nER1OViF7ZLXcVC2oeSBoC5Ntqrb6s0HAzfPhp1Qwg0goF8tuUirwftzYnN3xD+rgA JaTz1GO/RABV5k+8XlvILiQZVOiANaVkGmnq/An+p36UUvTCwi3o6rlkwpivn4KuF3XG WzO1t7436PO5zR70jGEhoSX3XekFXf4e6T1v8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=CvRiYuhYnuR651Mppw8za9+8AfZcjBxds0GLMWI0OQ0=; b=Yj9JYyQZJ9DVaFuyoGaK8Gsq2l6T3YwXRdwYb8SHqJ6GZKDMDzul7GOplfn1qlZt02 ya3BkyLd5oMq9tgH8y6BPUvvhCbETE9Jl2DSbXeY3Vbc1hXBydcN+/eYzN5oQgiUW8Yr vnwTviI4hAMJSLVjchsjXUwaN9v/fEWpOmt6NMj29RjrTxSBK9F4Y0oHjRddGHCiAsiJ G/DV4+6Q5WH+5KM5hW17UjBTn//1UVGfsPuLbPOUokFu5r/MDU9jkoovcPKnLsdA6/YG u268VjOG8iBfScY6wawwX21cfR5KOPsyEh3SHcALT7lNj1RZ7t63kplmR7m5DhG4zneR y3Lg== X-Gm-Message-State: ABuFfoitHCTMp8VqJiYybwb8A5rT3KRfsthCBMP93lMSvHH7+KDV4PFs k6Fq5W4pwkBhKz7YPS/icQKBgQ== X-Google-Smtp-Source: ACcGV62SyXvH/BV6YgJF22vxmUmTU6K5cl/7SX8T+EoT5tKFdR05ICg/jOLtxg/sa5rj3nIwMrdv1Q== X-Received: by 2002:a65:4d42:: with SMTP id j2-v6mr2105267pgt.232.1537898969395; Tue, 25 Sep 2018 11:09:29 -0700 (PDT) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:b6af:f85:ed6c:ac6a]) by smtp.gmail.com with ESMTPSA id z20-v6sm4473443pfd.99.2018.09.25.11.09.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 11:09:28 -0700 (PDT) From: Matthias Kaehlcke To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Date: Tue, 25 Sep 2018 11:09:14 -0700 Message-Id: <20180925180914.193244-1-mka@chromium.org> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Andy Shevchenko , Matthias Kaehlcke , linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH v2] ASoC: soc-utils: Rename dummy_dma_ops to snd_dummy_dma_ops 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Changes in v2: - use 'snd_dummy_dma_ops' instead of 'snd_dummy_ops' --- sound/soc/soc-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = {