Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp1320948pxu;
        Fri, 16 Oct 2020 09:07:52 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJwH5N7lBruqGNKpXP91vaonGIiZR1iM21S0Hz4KdlM+gFB2/0PDTxNWGHSIRdCy/SHPLD4k
X-Received: by 2002:a19:7409:: with SMTP id v9mr1788032lfe.402.1602864096278;
        Fri, 16 Oct 2020 09:01:36 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1602864096; cv=none;
        d=google.com; s=arc-20160816;
        b=lH4Ex7eJD6CpKnz5HHGYud+3k3mYtlZkr/qEIS2mhFUc8ZCmljD4m/wO4gFlL4qup8
         SdJ3T8rczjmPHsLroTvLazcMcvRps+e8fSabYPrPQTmA0pSQa/j6aRcig8vHLBtU4hF0
         4/iOlmXCry0BzIaJsAONnTvjqx9AhbPGW0xDsm2P9628NCWGbEASygfd81XI7BHNkptB
         dlMk1csJxSeJ+3c9AMXM5KUBwlKsOQ+XsXIgX2Yjwi5Z73GwWvyjUR5nqGyO2Gz/Jrz+
         PzgDLUl4/yeu+TS6w2V6XhwmKQ7i/fIb+yt3+va4xITV02lEHnc8F+eiLYszs5iQU7qD
         bloA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:dkim-signature:mime-version:references
         :in-reply-to:message-id:date:subject:cc:to:from;
        bh=OmjPVkQXuAcHfg1aXmReH5p2YM+CNTaZrB00dFKQZls=;
        b=udQAbx7wvnKF3rrLhB/71lKJqJrvxke+Qn/5h/f/cmSTsANOVASXemdgEZCkHrB2qW
         yv1kuJOETQPCKdt/W7BFNAJMGjIMnogy353syMuFRH0ueikFCWmocFg+Ai6Gp1fGAsSq
         ogLSdu9VBVsH9x+/JZ8zIJ5+tAu2PBgT3lL3qnYFyinPT8fxRwPk5G3bNLCZr3yC1hF/
         D10zXXkof+DVHS80iEjhCcVLlMO4/iv2rDnQWmBJTlVHzUOtC1V2eUVhT1C1Eq4/vik9
         +74EUPCF8oxqO6FpYU3gmAVzA9pvE7ks8fz9FsS+ufNV38IiwE3CuA5JcAsiSby/VBww
         jdlA==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=oQgHPYzB;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id x5si1967487edr.413.2020.10.16.09.01.10;
        Fri, 16 Oct 2020 09:01:36 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Authentication-Results: mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=oQgHPYzB;
       spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S2409137AbgJPOng (ORCPT <rfc822;thunderbird.krnldev@gmail.com>
        + 99 others); Fri, 16 Oct 2020 10:43:36 -0400
Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:4918 "EHLO
        hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S2409120AbgJPOnf (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 16 Oct 2020 10:43:35 -0400
Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, AES256-SHA)
        id <B5f89b1890001>; Fri, 16 Oct 2020 07:43:21 -0700
Received: from HQMAIL101.nvidia.com (172.20.187.10) by HQMAIL111.nvidia.com
 (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 16 Oct
 2020 14:43:31 +0000
Received: from audio.nvidia.com (10.124.1.5) by mail.nvidia.com
 (172.20.187.10) with Microsoft SMTP Server id 15.0.1473.3 via Frontend
 Transport; Fri, 16 Oct 2020 14:43:25 +0000
From:   Sameer Pujar <spujar@nvidia.com>
To:     <broonie@kernel.org>, <lgirdwood@gmail.com>, <robh+dt@kernel.org>,
        <kuninori.morimoto.gx@renesas.com>,
        <pierre-louis.bossart@linux.intel.com>, <perex@perex.cz>,
        <tiwai@suse.com>, <p.zabel@pengutronix.de>,
        <thierry.reding@gmail.com>, <jonathanh@nvidia.com>
CC:     <alsa-devel@alsa-project.org>, <devicetree@vger.kernel.org>,
        <linux-tegra@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <sharadg@nvidia.com>, <mkumard@nvidia.com>,
        <viswanathl@nvidia.com>, <rlokhande@nvidia.com>,
        <dramesh@nvidia.com>, <atalambedu@nvidia.com>,
        <nwartikar@nvidia.com>, <swarren@nvidia.com>,
        <nicoleotsuka@gmail.com>, Sameer Pujar <spujar@nvidia.com>
Subject: [PATCH v4 01/15] ASoC: soc-core: Fix component name_prefix parsing
Date:   Fri, 16 Oct 2020 20:12:48 +0530
Message-ID: <1602859382-19505-2-git-send-email-spujar@nvidia.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1602859382-19505-1-git-send-email-spujar@nvidia.com>
References: <1602859382-19505-1-git-send-email-spujar@nvidia.com>
MIME-Version: 1.0
Content-Type: text/plain
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
        t=1602859401; bh=OmjPVkQXuAcHfg1aXmReH5p2YM+CNTaZrB00dFKQZls=;
        h=From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To:
         References:MIME-Version:Content-Type;
        b=oQgHPYzBikRGOO/lyfdl47eLjJuz3bJ8T9H3jtw55YPlk7rDNCiFKTysKMrIEJi7w
         Mf1nr/52o2eRdqljMljaWc/iSvwO0TCIqbnk2/070Ix3hX9x0ctqsj/ItE7vi8HNlB
         UYqokTC/N5BOcai2CA1zE1Ku3ZDEmva6Aqwc43rYDBtZGp1FSwMkFK1nWmYidBLbRI
         3x/aPqBD9FFdB9alPaQMcrhcf/Fk4xB7YE7hRFohW/nhsDAv9zc+ophuHUwEpq3fXO
         FVEaNw1N3XLH36nmkHTV2wF/WmNdcDj+xNGxqaCCbkP3g+nzqbemgn3vXogIvC25NG
         NIScVhwZsxGqQ==
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The "prefix" can be defined in DAI link node or it can be specified as
part of the component node itself. Currently "sound-name-prefix" defined
in a component is not taking effect. Actually the property is not getting
parsed. It can be fixed by parsing "sound-name-prefix" property whenever
"prefix" is missing in DAI link Codec node.

Signed-off-by: Sameer Pujar <spujar@nvidia.com>
---
 sound/soc/soc-core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index ea3986a..cb7333d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1124,7 +1124,8 @@ static void soc_set_name_prefix(struct snd_soc_card *card,
 	for (i = 0; i < card->num_configs; i++) {
 		struct snd_soc_codec_conf *map = &card->codec_conf[i];
 
-		if (snd_soc_is_matching_component(&map->dlc, component)) {
+		if (snd_soc_is_matching_component(&map->dlc, component) &&
+		    map->name_prefix) {
 			component->name_prefix = map->name_prefix;
 			return;
 		}
-- 
2.7.4