Received-SPF: pass (google.com: domain of linux-kernel+bounces-46227-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Chancel Liu <chancel.liu@nxp.com>
To: lgirdwood@gmail.com,
	broonie@kernel.org,
	perex@perex.cz,
	tiwai@suse.com,
	kuninori.morimoto.gx@renesas.com,
	linux-sound@vger.kernel.org,
	linux-kernel@vger.kernel.org
Cc: Chancel Liu <chancel.liu@nxp.com>
Subject: [PATCH v2] ASoC: soc-core.c: Prefer to return dai->driver->name in snd_soc_dai_name_get()
Date: Wed, 31 Jan 2024 19:23:51 +0900
Message-ID: <20240131102351.469214-1-chancel.liu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?s5kjyfj87mzRwBTM16bKRdJasTXST5U/Ov+7aD9+jEcgz5/S30j/dCer14Iz?=
 =?us-ascii?Q?B6vqT1IrsaeOGDFBt87Kr3jeo22Wh5GVtQfxT67dcGiWr77usQBd21lRwvl7?=
 =?us-ascii?Q?YFCzvo9u+S8wmDy0Jdm7Nvw+zosJLOnEnSRBxPlMbxg/drMMTVHyOS/xN7CE?=
 =?us-ascii?Q?tWZpe9WfOZmsJV1mo7QrsYrSYIWzeA2vLPZTV0rP++Pf7XO2L+AubwEM5wWf?=
 =?us-ascii?Q?IJBweMxCDPKOsuWiOxSc1cnAywjqTPXpnNQn5pm4tlO6xzx4B9c2AHfzgRP3?=
 =?us-ascii?Q?W7NpzgnwVcK33OI3J9E3/1g/A/xPavGgp8jpXy+fqhCcHFOltVrsWH+Yk6QD?=
 =?us-ascii?Q?4SAScW4XH/ETlhVCISs3yQnX3MNWQSibg1lPhSzxSvB8cmQKau31fpzb7rt4?=
 =?us-ascii?Q?HuqZcGNaCu2FnbayM7emlUxx+G96KnkDKPTtasCNDwix/Wr5PYEY8Q53ANQd?=
 =?us-ascii?Q?tBRWRVYPaWhJJ/nXUbsJzpby9G71+TqxaCTvZtJ2cnMmQybDOc8Ozkb/YFNT?=
 =?us-ascii?Q?qteoCTHgj3UMieLIvv7sLHy0j114Omz0L4C8kAdkaDM+DMUtqnzJXpyXVSL5?=
 =?us-ascii?Q?ohxTWSu34uzYdYN62xHk5N2fXWj/N9KYtHtMWOF0hMO61qdttt/AxWsNH/KI?=
 =?us-ascii?Q?NG620vNrKUT8zNE5umk0faVs50PU5u08rfwalTW1Mu8ODPIKvFbcZWHUw9dh?=
 =?us-ascii?Q?Cz57M9ddA8qHVzkM9F83jumFo9n4JN3dda9PCRyUUkT2XewjwL1//n59JHDH?=
 =?us-ascii?Q?Egel9zbxMIw15U3JjpqS63vWztBkpWjgyDStmx7YBZU5UN0VJXljcNJZ+F3n?=
 =?us-ascii?Q?EuCLfKn6o6UdiZPxNoY8smEl66fFfiRb7h6tLO61iot4igF4SLEonMtWNSPg?=
 =?us-ascii?Q?NhFiuhLamz2UBz5NQtydLhb/cI5cwvrzFbYK0Bd+cka+JSlIV/6RVwpmmk0y?=
 =?us-ascii?Q?5shLyVQ1GtqiO3C1rGXJ5TSUSbEjELzM/mOGJA0+goypcExlDls1pdD969Uf?=
 =?us-ascii?Q?FtxqE1uIrTiKd+RoWm39DYW6wpPmHvtjvgAdeHIr/J/RpOszYVFBksauuHTP?=
 =?us-ascii?Q?lyUqt9mi9A4vRXG0+pV7smO5zRxdPTk35J6XPK/BZQD3ItmledKplRgEBjEJ?=
 =?us-ascii?Q?HL0mVE0q+ZAWcVrKN30BFm34p5oc0XH8DiXR8Vg5fwvH3ZSYz9bKho1wv4En?=
 =?us-ascii?Q?lpav2MXreU+YDbI3+NtSLj2/Wrfj04E29fmoOmW2qDABZANk9/ZiyjiI4lKt?=
 =?us-ascii?Q?Uwh7QB1P+kUA6lLceSf/RNeRGSb0KtkwUycGbbDP+Pw2u9VziURm8a3kJuCU?=
 =?us-ascii?Q?KJ46FD8n19KP1cKHCf5fiS22s6TrjqRafquOap8ekgwjTwUkxNy9wSfW1DNF?=
 =?us-ascii?Q?tJa2lpgm58X4SRSjmvprXix/0yNJThpElAaUePaH1EtC8Bw5J6fB6uDBWyAN?=
 =?us-ascii?Q?1k54kkCIVHktdeUwFS48IyHhsoftQ+NMQsWFL5W91gwHA3WNXfcthyz8Ihm4?=
 =?us-ascii?Q?U/DKpf/SKLs8WpYkS04zIfOt5u+LB7ZsS7mwKgokcBq1CXP57eq0Bm7lgfUt?=
 =?us-ascii?Q?6jBs3w8kNWqQno+Q5OmUqEnKi5Eb+UCFjFbrL+/n?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 88b3c61a-8f33-4ceb-04cc-08dc2246ec46
X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9498.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2024 10:25:18.8635
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oquSCJSxaWyZTAFaG24QeGtaQf/75vbDsqW2MHLWZe5Vb8bD/Y7p6bohN7VkF+Ei6wkBCIEUka5QZ5zR4l4Wtg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7448

ASoC machine driver can use snd_soc_{of_}get_dlc() (A) to get DAI name
for dlc (snd_soc_dai_link_component). In this function call
dlc->dai_name is parsed via snd_soc_dai_name_get() (B).

(A)	int snd_soc_get_dlc(...)
	{
		...
(B)		dlc->dai_name = snd_soc_dai_name_get(dai);
		...
	}

(B) has a priority to return dai->name as dlc->dai_name. In most cases
card can probe successfully. However it has an issue that ASoC tries to
rebind card. Here is a simplified flow for example:

 |	a) Card probes successfully at first
 |	b) One of the component bound to this card is removed for some
 |	   reason the component->dev is released
 |	c) That component is re-registered
 v	d) ASoC calls snd_soc_try_rebind_card()

a) points dlc->dai_name to dai->name. b) releases all resource of the
old DAI. c) creates new DAI structure. In result d) can not use
dlc->dai_name to add new created DAI.

So it's reasonable that prefer to return dai->driver->name in
snd_soc_dai_name_get() because dai->driver is a pre-defined global
variable. Also update snd_soc_is_matching_dai() for alignment.

Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
---
 sound/soc/soc-core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 516350533e73..847f92721fdb 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -283,13 +283,13 @@ static int snd_soc_is_matching_dai(const struct snd_soc_dai_link_component *dlc,
 
 	/* see snd_soc_dai_name_get() */
 
-	if (strcmp(dlc->dai_name, dai->name) == 0)
-		return 1;
-
 	if (dai->driver->name &&
 	    strcmp(dai->driver->name, dlc->dai_name) == 0)
 		return 1;
 
+	if (strcmp(dlc->dai_name, dai->name) == 0)
+		return 1;
+
 	if (dai->component->name &&
 	    strcmp(dlc->dai_name, dai->component->name) == 0)
 		return 1;
@@ -300,12 +300,12 @@ static int snd_soc_is_matching_dai(const struct snd_soc_dai_link_component *dlc,
 const char *snd_soc_dai_name_get(struct snd_soc_dai *dai)
 {
 	/* see snd_soc_is_matching_dai() */
-	if (dai->name)
-		return dai->name;
-
 	if (dai->driver->name)
 		return dai->driver->name;
 
+	if (dai->name)
+		return dai->name;
+
 	if (dai->component->name)
 		return dai->component->name;
 
-- 
2.43.0