Received-SPF: pass (google.com: domain of linux-kernel+bounces-90121-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
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,
	alsa-devel@alsa-project.org
Cc: Chancel Liu <chancel.liu@nxp.com>
Subject: [PATCH v3] ASoC: soc-core.c: Prefer to return dai->driver->name in snd_soc_dai_name_get()
Date: Mon,  4 Mar 2024 16:21:28 +0900
Message-ID: <20240304072128.2845432-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?uizufDMDJAyGuauU8DFOtC86hKwju//grgkCDTPx/E3Nbk4ezfLVPi51rKy9?=
 =?us-ascii?Q?vDRG58X0VA1xmNMz9rPSD/P4ml8Y2ktEI5rwa+argI4DTIB2GH2iQZ5Csh44?=
 =?us-ascii?Q?efYPR/rMeehPDiJlp72NZE6SCPg04V70q30/SNcnwzF5CvYnEnJeY9KlYatC?=
 =?us-ascii?Q?s8Ly45IbutSy1b7ZIf1UYBHNzVgZHRnbyVIfCpPql9WtTaCuIcf3YsLfsvSQ?=
 =?us-ascii?Q?7+TSo96W6aNZga2dnbdf68VutuSdja9xoj2hs87o1uCnUaiQEV8vTmqi/h0c?=
 =?us-ascii?Q?V9t3+dveOdXwIigHonkuwn4M401gqKqxNmdYwqGL+cTbWBZLQwbk05Sx1ZX0?=
 =?us-ascii?Q?k2NcMOpvC5FTow58XKpnpO9bJLkMlqbSf+vI0IM42Sn5/XjJ7mQIDysOt+Mh?=
 =?us-ascii?Q?1x7jRV3OmoxYNti4NcvYfSgcc0xH4BSR4d2K/BnRR12Xi0kFMbtvwx5wIKcU?=
 =?us-ascii?Q?iWcmgXM9/sL1TXq0QoShneUMXKhgJ4zzNjEYlr5Jp9TE3h86rgQypjtC5oSe?=
 =?us-ascii?Q?ETLHED8sdsNx1eEJntIZPqwXdlR5LbPgmnrqLCcbxCY18AZPGDJLiMYp8T/O?=
 =?us-ascii?Q?/tr9JoWCt2Z/aNb5oDgtWRm4oDBB6I7AGdwXOlcecBk+xcgrw7RCAjc++byB?=
 =?us-ascii?Q?tE8td2WZtliblh33IjTbnInZVA5ul5X1zQEfxd63VkVBM1jAO1QADKhd6vqr?=
 =?us-ascii?Q?KFqTvUmDWFtDb1lHsV8T7sPdS2Gxe57c7QJY9mhsNN077Ift3B1HOy1pvxvv?=
 =?us-ascii?Q?3zHryE3oMC5+PpLvDIbAjqbFJCLH7iNIswduWWrWZJG8s7cv0iGRsEmVQjet?=
 =?us-ascii?Q?MIyiygP8W5u1R3KkXQnjAqO6HZDX9W1vlGrLDuX6VuhX9/44/bGYjtEvTiYs?=
 =?us-ascii?Q?TZTMkkCIgOIfSkMfODc3WZQpO7Jg6YEcMJU8RvDaFiUC1O0gp1SAjC/VYbul?=
 =?us-ascii?Q?4h0RTrb5MtU3IjZ+JL3L7AE7EpIg+0RHanz5aXG3kd6aYjPE8wy2sOh4Rqv3?=
 =?us-ascii?Q?O7Bc0IS2LqocjLh/ApLcfIcJc7ND5RisWuECEqT79+wEUFdqqgWg+SGpfMTq?=
 =?us-ascii?Q?aM3TNluztulzXf24L8HBNOFZdWd81nQFntahdnMnweNNVx94GEJdOafyl6MJ?=
 =?us-ascii?Q?U1o9biG7/32gpw+SNU+dLoRgoRt7Bb+XM8nLhb5EOTXtzMqs/IqLRzSKJBwC?=
 =?us-ascii?Q?Qog0Uq35i/NBd0sbFOKUNhoqoXaMm5bbEwpk51Sjuy2nrbT4MEVzisFjbBzg?=
 =?us-ascii?Q?56/f9NH6NlX4VM4PgTphNqsIuiMzPFYQTSfxVbZyvkPdZDpk0rqafGN3sMvZ?=
 =?us-ascii?Q?uv1BXnzlgMcxKxV7SqD2bMJkAc5aOg1bmPrlXGdqwO9gZ1aEn7PJ1RfRP7gC?=
 =?us-ascii?Q?0vP/ACwWJBuuTF8WCZiVTefpN6CYyFihEagWq3YTzQtsQprGgjTriOZULjKp?=
 =?us-ascii?Q?3T9w2cdoShqMJmbFFKiukFuf4d0lGGUIFkNua2xvueIs8oEhjoWA5NDS4wOG?=
 =?us-ascii?Q?vlHmVhGGRJ6CKxvVEF3omfGFpJ6OKUcAv1Mwju2zQ/HVwVY1h82rd/BYuTII?=
 =?us-ascii?Q?KS99m9pg+tpPre9aS0mzEEi/b2NNFWWxZqpf0PU9?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d804e1f3-0176-4955-8241-08dc3c1bda2f
X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9498.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 07:22:30.3384
 (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: etHJlhST9f7ARZqwDAwu7i70EkOQKjbep/SkyuNB6TLviOUm5sQgdsQQYxSZL89L/w17PFBK3CuWw9YS7nFcgA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7350

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>
---
changes in v2:
- update snd_soc_is_matching_dai() for alignment
changes in v3:
- resolve conflicts when applying patch, no others changed

 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 507cd3015ff4..1e94edba12eb 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(dlc->dai_name, dai->driver->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