From patchwork Tue Mar 8 19:00:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 549741 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2C072C433F5 for ; Tue, 8 Mar 2022 19:01:18 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 18E821862; Tue, 8 Mar 2022 20:00:27 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 18E821862 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1646766077; bh=l8BprZhCcY0+1FGTt1yYzXDD/HdN7Q07+i4mMB1L//E=; h=Date:To:From:Subject:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=vSeuagfJtCpC27yRE2xqBERKoy9UZgu/l4PSacIdz0ruwFEklNhjjgo+UGp1XpS4E qnaH4Yr8q5BTYU+BqEPWRmRKIcHPVh14MfhHZSPZ9m3vSD+lXNOuv1Q4wi9m2n0fTv Q37yV9BUn+LOLAxmhk10KMV9GqmvMUCItTFWPUbM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A437FF8025E; Tue, 8 Mar 2022 20:00:26 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 211B6F80121; Tue, 8 Mar 2022 20:00:24 +0100 (CET) Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 96764F80121 for ; Tue, 8 Mar 2022 20:00:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 96764F80121 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="e9JIQtEI" Received: by mail-wr1-x430.google.com with SMTP id x15so30009820wru.13 for ; Tue, 08 Mar 2022 11:00:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:content-language:to:cc:from :subject:content-transfer-encoding; bh=BrK7bDjpNNfbNfWHDDgIDYJgMsjhI5oc67ZcgDStByU=; b=e9JIQtEI5R4Pw82Q7GiVcSHmHvhDspmi4O1tsaetcGCtBaN9BUMuTL0z538e8pqnl9 hje6B0n35FNnVNbO8c1yQ/4qJntF4bC6QPq+y07wI7/owtgOXtdhcdXqpz/T5Qle1Mbv 0WBI/UkQhynUHbLKCECq/xsmRsGpJGrX2nS0/hnc4RJ+8ipn+cwTL9kd5x1mONvAg5SI 5oOozD4a2Cm1XEswO+kYbOJM+XI/p52kx3DI4fAbepQpzqUy3GMMSSbaozBW833ia7+e mOSWmQhSdija5mSXTYwI6S+p1T7+iU3ZwyH7L9r23RVBkprBehPkNuMRzDAzPlhQJYeV trDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent :content-language:to:cc:from:subject:content-transfer-encoding; bh=BrK7bDjpNNfbNfWHDDgIDYJgMsjhI5oc67ZcgDStByU=; b=Vg0/wlujGHyYeu0LDQyE4CF4dBJUt0h4HOPB/k8gopmLr0wFnqF7bYiUH61C89FUfT 4WO3aiO9R0UND8B8OKi7lyTB73fjG0t8NU+1WJZZ0PnvyRpjB+lHpTCtDDxwGLMdvv9Q otBZMqjVOa5aXoYOkb3MuBNhPTPEtlaRzmUbwCiDwYQCkh/EOzlm3WspTdJFUWb+2LHz q7IsIq+KjX60Ue7rFL/2zTv320Ira6JEDszCgKrFbJV1uVWiU0L1/Cu6t3OnMJdy0RyB gKz6xioCo1vDIyEQXsQrpeuJUiFF1uRYSxFAFe2/t5dhunid0AP+lArEbEhBnYbsqzqr SZBg== X-Gm-Message-State: AOAM5333we8de35ThH+q8gKp7/snJRQ+wWdblTDzOVZOrXn2yGix19Yc 6MbdSHKMYU3sqhXm2nXlJc4= X-Google-Smtp-Source: ABdhPJyG5uJSpcng8hHCapbm6cigma4b5tpf8v55ugHdYhR+9V6enUL/sDZaOk/SQs3ypuqYOBp1KQ== X-Received: by 2002:adf:dc91:0:b0:1f0:728c:8faf with SMTP id r17-20020adfdc91000000b001f0728c8fafmr13673390wrj.287.1646766020389; Tue, 08 Mar 2022 11:00:20 -0800 (PST) Received: from ?IPV6:2a01:c22:7b54:500:3175:f9ac:af86:a778? (dynamic-2a01-0c22-7b54-0500-3175-f9ac-af86-a778.c22.pool.telefonica.de. [2a01:c22:7b54:500:3175:f9ac:af86:a778]) by smtp.googlemail.com with ESMTPSA id bg42-20020a05600c3caa00b00380deeaae72sm3516970wmb.1.2022.03.08.11.00.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Mar 2022 11:00:19 -0800 (PST) Message-ID: <7d6c2755-77ac-86db-899f-7342ee9e69b5@gmail.com> Date: Tue, 8 Mar 2022 20:00:14 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.2 Content-Language: en-US To: Jerome Brunet , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Neil Armstrong , Kevin Hilman , Martin Blumenstingl From: Heiner Kallweit Subject: [PATCH] ASoC: meson: aiu: fix duplicate debugfs directory error Cc: "open list:ARM/Amlogic Meson..." , alsa-devel@alsa-project.org, "linux-arm-kernel@lists.infradead.org" X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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" On a S905W-based system I get the following error: debugfs: Directory 'c1105400.audio-controller' with parent 'P230-Q200' already present! Turned out that multiple components having the same name triggers this error in soc_init_component_debugfs(). With the patch the error is gone and that's the debugfs entries. /sys/kernel/debug/asoc/P230-Q200/aiu_acodec:c1105400.audio-controller /sys/kernel/debug/asoc/P230-Q200/aiu_hdmi:c1105400.audio-controller /sys/kernel/debug/asoc/P230-Q200/aiu_cpu:c1105400.audio-controller Because debugfs is affected only, this may not be something for stable. Signed-off-by: Heiner Kallweit --- sound/soc/meson/aiu.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/soc/meson/aiu.c b/sound/soc/meson/aiu.c index d299a70db..c1a2aea5f 100644 --- a/sound/soc/meson/aiu.c +++ b/sound/soc/meson/aiu.c @@ -68,6 +68,20 @@ int aiu_of_xlate_dai_name(struct snd_soc_component *component, *dai_name = dai->driver->name; + switch (component_id) { + case AIU_CPU: + component->debugfs_prefix = "aiu_cpu"; + break; + case AIU_HDMI: + component->debugfs_prefix = "aiu_hdmi"; + break; + case AIU_ACODEC: + component->debugfs_prefix = "aiu_acodec"; + break; + default: + break; + } + return 0; }