Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp655381pxk;
        Thu, 1 Oct 2020 10:35:28 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJx23uAomHYHLr934avBgyGonmoIdZdPtUtpKM97DcHyCClDc6Wo6h18SEe08xZ4Ad8xqsk2
X-Received: by 2002:aa7:cb44:: with SMTP id w4mr9529360edt.139.1601573728523;
        Thu, 01 Oct 2020 10:35:28 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1601573728; cv=none;
        d=google.com; s=arc-20160816;
        b=DmoKPYOIduY040ibl5Ou5fzLLa4IJCWgDhidm0RDEgdk+kv7o1iDhtchNa2W9RIzLZ
         TeAA+QQlJpCZyAGsvDZaZ6p9uqg8V6qF50dQcKVcns6tFk52GEEaY6E94oG3LlZ0M/oD
         z9tgtt3GZ9O0bCWqOYxqyNdRoFEyq2qYGFTWrcK9SQsp+yahUq8ddWGE6+pNcS076eVd
         bBvWjzrf5Yvh+jxr2NyL63hwzPXcvWY5oSw84E13d484FuE1kNtKBgIlEaLi8ZEedYNQ
         b5PMwxIMEr0Khy1dM+WYcwELwQRZt5AY/LrfjEDQJyp4DUOoaKg/xgZvz0NSpo2LJz+M
         yKqw==
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=uRImc76K31n+hTi7iV8LIW2zE967Cr4MOzJhpu4XeKk=;
        b=gmYzw2mLBdL1Hz21ALINJTdgDOWJP2VLnYe7bJ4l9q6cswEYAcxclWUPm1O1mzRmA1
         zTdBgnFRWKRy9ui+b1AeLL6HDYfd76WVp7nHiYPEtDrIlIO13JCug7lKjilUj32U1c9+
         rZ3JDxd+V3DC3ZIKbYYqZ1tajrb2U9WFTLQpg3WkBUaLT6/KZLRDHure9Qac77l9EuqB
         sWYdDDiZTuYTNVP675dA+Lij9xOS7CZuL+Ur8BFx+WggNMXh8p2fORpLutASYux+lhBs
         fZo45rDR+Euaa5J96cZHRo/uaiT9rkhAdFg6gkIaJ8amAYMZSYEGZEZTHRx7TfP62WuM
         2wOg==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=DcDXK86b;
       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 g26si3900076edv.609.2020.10.01.10.35.04;
        Thu, 01 Oct 2020 10:35:28 -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=DcDXK86b;
       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 S1732944AbgJARdk (ORCPT <rfc822;zffurovfq63@gmail.com>
        + 99 others); Thu, 1 Oct 2020 13:33:40 -0400
Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:9922 "EHLO
        hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1732876AbgJARdh (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 1 Oct 2020 13:33:37 -0400
Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, AES256-SHA)
        id <B5f7612bd0000>; Thu, 01 Oct 2020 10:32:45 -0700
Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL107.nvidia.com
 (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 1 Oct
 2020 17:33:33 +0000
Received: from audio.nvidia.com (10.124.1.5) by mail.nvidia.com
 (172.20.187.18) with Microsoft SMTP Server id 15.0.1473.3 via Frontend
 Transport; Thu, 1 Oct 2020 17:33:28 +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>, <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 v3 01/13] ASoC: soc-core: Fix component name_prefix parsing
Date:   Thu, 1 Oct 2020 23:02:55 +0530
Message-ID: <1601573587-15288-2-git-send-email-spujar@nvidia.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1601573587-15288-1-git-send-email-spujar@nvidia.com>
References: <1601573587-15288-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=1601573565; bh=uRImc76K31n+hTi7iV8LIW2zE967Cr4MOzJhpu4XeKk=;
        h=From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To:
         References:MIME-Version:Content-Type;
        b=DcDXK86bTbtPxFls8Nzc2w1338dEuAY1M7adk3YDn5Z6cDRDchIlmBMIdwm078snY
         ZB3p89jB2O2eRpkRUu+/xGsVG1IIsorYHsuKVfQa0zSvdCtoxb840H/DklTNUQGwpv
         4gYsl7Oa7IAaBzzzPolyu+W3TKzl+RHwaanFqz6psT8Mw58z1ZDm40Vvr81IoB6NL2
         A+dNeyMnfGpns3kja5tj5Aay5qc9secKAqlv9/xIb/ZmPmYKev2YsxzX9C5K3AGYc/
         IsFU/EZ7YNRw28/mgeOeS0yGpzBa6ywMucK9KRvFdJR/xfsotmOHxQ3qB8Tt54niNK
         Efx9jvfU+0qxw==
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 74df224..a784943 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