Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1116178ybt;
        Fri, 26 Jun 2020 21:57:54 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJw/gY6A7CzEjCb3InHPgjV1kCwVR+Hy2GvHEfPpYWopyh3+RIy92i9M4pMezOkPYxy7hksq
X-Received: by 2002:a17:906:19c7:: with SMTP id h7mr5268878ejd.403.1593233874613;
        Fri, 26 Jun 2020 21:57:54 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1593233874; cv=none;
        d=google.com; s=arc-20160816;
        b=x2JcEBbLFLOgvpnJwhr7LkpMWBJNgWjsfoeIUBRZkoUbXMyukUVQgqqWGtnZi+OqjN
         GL1WhQGU3gtDd6ZA6vByBVRcfuteiLzAYjRf49tyzJe+E3w8NBS7nf+fybUpZ1iMW4ab
         U7kgtH/i7zPV4oPML9pzrJhxWpYddAHgUljPEXm3WcoEr42B5yXLx6aewIZbeeMRWoES
         fIG1RX+PCYnQrVhTYaa2Qz1XaRRM+qs7/V/KvUtw4SFn+F45frj104no7dZSd9UeGct2
         8hsWAIyjxmWVujw0KUx7uOYuzZktRMtLZ0FVWAfNxPVrwIyPdmy0eljVsF7TEckevQO2
         6atA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=list-id:precedence:sender:dkim-signature:mime-version:references
         :in-reply-to:message-id:date:subject:cc:to:from;
        bh=Aqc23rPM+/+YfF7gUxbU0Uby6S6q/iF4yfPy4mrpIFw=;
        b=uC5BY0sGZ6JxuRccGXNEVmS5q0dfsc1eIVQWmA3OoFq/nxwX/ymXRUyZ1IxLtFpD44
         9EjiO2N3s/iJls+E7AGLt3W7VfD2YylanipY0xu+d/WvDEEFk7RkZtvQaYbCbATXbFzj
         e+paFenKoxt0pTGk4XAy+44bNj+IxZvRI3aYmRdupyP4CqK/sko1NeUHbQWCdeFU9SBl
         m2uDrw7sWEEXjroDsY/zTDKDMtFQj2YySA1byLNF9KOEmNbMk7Ba6ZYZp7BP7mPXp7Yl
         MyvmuoTUzUBDRZYHXT3NARhlXgGv1bUhb5l43JTKCTTmmYi6c51UuzuHl22v6/gCf5Jm
         qxwg==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=a3+uDdXS;
       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 t7si7981677ejx.225.2020.06.26.21.57.31;
        Fri, 26 Jun 2020 21:57:54 -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=a3+uDdXS;
       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 S1726165AbgF0EzC (ORCPT <rfc822;rajatbajpailinux@gmail.com>
        + 99 others); Sat, 27 Jun 2020 00:55:02 -0400
Received: from hqnvemgate24.nvidia.com ([216.228.121.143]:8632 "EHLO
        hqnvemgate24.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1726150AbgF0EzA (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Sat, 27 Jun 2020 00:55:00 -0400
Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA)
        id <B5ef6d0c40000>; Fri, 26 Jun 2020 21:53:24 -0700
Received: from hqmail.nvidia.com ([172.20.161.6])
  by hqpgpgate101.nvidia.com (PGP Universal service);
  Fri, 26 Jun 2020 21:54:59 -0700
X-PGP-Universal: processed;
        by hqpgpgate101.nvidia.com on Fri, 26 Jun 2020 21:54:59 -0700
Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL105.nvidia.com
 (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Sat, 27 Jun
 2020 04:54:59 +0000
Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL109.nvidia.com
 (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend
 Transport; Sat, 27 Jun 2020 04:54:59 +0000
Received: from audio.nvidia.com (Not Verified[10.24.34.185]) by hqnvemgw03.nvidia.com with Trustwave SEG (v7,5,8,10121)
        id <B5ef6d11e0001>; Fri, 26 Jun 2020 21:54:59 -0700
From:   Sameer Pujar <spujar@nvidia.com>
To:     <broonie@kernel.org>, <perex@perex.cz>, <tiwai@suse.com>,
        <kuninori.morimoto.gx@renesas.com>, <robh+dt@kernel.org>,
        <lgirdwood@gmail.com>
CC:     <thierry.reding@gmail.com>, <jonathanh@nvidia.com>,
        <digetx@gmail.com>, <alsa-devel@alsa-project.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 08/23] ASoC: soc-core: Fix component name_prefix parsing
Date:   Sat, 27 Jun 2020 10:23:30 +0530
Message-ID: <1593233625-14961-9-git-send-email-spujar@nvidia.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1593233625-14961-1-git-send-email-spujar@nvidia.com>
References: <1593233625-14961-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=1593233604; bh=Aqc23rPM+/+YfF7gUxbU0Uby6S6q/iF4yfPy4mrpIFw=;
        h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer:
         In-Reply-To:References:MIME-Version:Content-Type;
        b=a3+uDdXSkUAcYGSblwdUXLAN5Hd2UtRL7Phb918qYgwQ9KAgw/TP9+mWPGZoPjLKp
         YFWpXj+idLkWhDUCZ7tGTWA6cmXAg5LO6jFRAsEywNyAQBy/JTLZy3YhACncFpI2Jy
         ag4/jg4ZiwSOQIDkOqSjzoJD8nmeuR30sJm7CanbH6Q7Kh3Ve0D5tyn8Su5eAQ4TND
         kR4Pegxrqq2/8k8MP9g4XrhFkK7BgoWQxykTQZ6zllaNiJLQKQBTX2rxU6uKdDhJLw
         bEeA2ZUL75AmIKJFmxbQY/hTa87rsh1HksRHp9kYiC8bHkrd86/yhbMZbtBegw2aj2
         aClKYJefLyA1g==
Sender: linux-kernel-owner@vger.kernel.org
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 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index adedadc..8faca60 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1111,8 +1111,10 @@ static void soc_set_name_prefix(struct snd_soc_card *card,
 		struct snd_soc_codec_conf *map = &card->codec_conf[i];
 
 		if (snd_soc_is_matching_component(&map->dlc, component)) {
-			component->name_prefix = map->name_prefix;
-			return;
+			if (map->name_prefix) {
+				component->name_prefix = map->name_prefix;
+				return;
+			}
 		}
 	}
 
-- 
2.7.4