Received-SPF: pass (google.com: domain of linux-kernel+bounces-42278-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] ASoC: soc-core.c: Prefer to return dai->driver->name in snd_soc_dai_name_get()
Date: Mon, 29 Jan 2024 16:18:39 +0900
Message-ID: <20240129071839.2393483-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?nEbzJ1mQki5B1xPSH1HZmeNLHy4Eo+4oJHF4yCAQ9iMUuB98CP38iDs+v8Ll?=
 =?us-ascii?Q?BCOc47nuPKDjAFvGVqBM4IdFHhD6R2DCMqqooI6UzIUAf54aBvgbI+rGVGbS?=
 =?us-ascii?Q?GxJ4n7WhwESCjuqA/59kBZLKLnShznn04F4ZuKk6jqmzGdOHbLNCT4PTEexQ?=
 =?us-ascii?Q?IUeL7xbw+fjMsemuktW5pkO+S6CL8Mpd33jRIWuzc/q0bx9Serg7i7f3xrBS?=
 =?us-ascii?Q?ikF/KnGSXkjOHJ1Ifu0UTa9az3PZm4lv9k/bv/P7b7Li5cM5ONne4Z5e1sQU?=
 =?us-ascii?Q?sZcYheNQKDBcNaCxhndx4pT4idCh7cP8vw5wRuB/dCQJWqh1Ioqcty942c+2?=
 =?us-ascii?Q?x57acI3L9P6i/cCR9BAunBFD+eRCAIlaKfiUWivt2y0OKfPeX2qPwNMjmAv5?=
 =?us-ascii?Q?Z1oloONg9uld6cx1M7zJPVpZLdA3YehvJVF4elO8uz4n+cjPQnGmwkdwsWd2?=
 =?us-ascii?Q?NfyWWrYwwlHh8CEcgLCG0y1jh5A+fTTgCZmaZLoj7rhh+mc1mrS0N18lMGBF?=
 =?us-ascii?Q?161FK+n7hmwuW1yzZm/EEx/6LuncLB9Nir9oplwLdfkaUMioKinBq+jM+oET?=
 =?us-ascii?Q?vZepw89hK12e25zdRHDGAFRhrBuWc8zc1Fj6krIMUtdoRtZjj8kE/RURlcqr?=
 =?us-ascii?Q?/EFeoWXNV09u4oCXObmzM6leDGk9AimF6FLANKBdBVUvwLF3J7G1L5OJi5Ux?=
 =?us-ascii?Q?4rMadiQRmDsNR6qgb7sIBn0f20aDlE9LhH9B6vego89Kg6K/4ObOwl+g8Q5l?=
 =?us-ascii?Q?RHEzkr4uc14BJWJZ6QE/ag/DLFE+6yQpOzhzAidOdg64ZseWTDrSqai4x4tb?=
 =?us-ascii?Q?5/FjP5dl5g3C51ye8nLNbah49swEM6Q3FNRlBX17mvZxevmIbQqVQ8wangZ4?=
 =?us-ascii?Q?Scw5JhgKpuAkOKMYqKrpQDYJW6IqIvtLp5ePpkhkHW8cNKe9crLNV51epwRE?=
 =?us-ascii?Q?oCJuXcW+A0iwCLsIZ7F+0UH7OUo1MtZVRwBPjMyCHZLyEfWGxVDATOt05ozG?=
 =?us-ascii?Q?jEtSo/VGJ/gqgnO8iPqddsg7N4z4ho50E3/5CMXj1HbdCqc5pkLMiaZfIMxW?=
 =?us-ascii?Q?hCszFdHg/HhYiLkl7McljstEN8wTRx3ZDmEnJcBRQr2g3y13AAnVDZXljXhz?=
 =?us-ascii?Q?J0BXddxfXYM71fcUFnsgvsj6Op2g+2hedzF//vUPzkoAVRPkyOC/X2jxxCT0?=
 =?us-ascii?Q?dIFB7Awxvk4hePOF06O/b76SsNkcMx9rveqsY72b69RWb8bnbuwSrYWduU7p?=
 =?us-ascii?Q?2lhYmN5VMqe5oIN+e7QFfs2Wd+rFF/i3SDYt2/g2TtsYPtc8gV6e+0kSTCMW?=
 =?us-ascii?Q?2Q8ihfkMEFihfJ7fVQswZ61f52NJyN9wTfVFXaO8sz0f9Z7FTih+DaQv6v1E?=
 =?us-ascii?Q?D3xdPgDlmQX4kz1bulCq2z1Jr+5vaZ3HVgWSwvkkXhenb9EjuBDBNJdIKAb6?=
 =?us-ascii?Q?XA/loVtuVHwiNMxpn4bgCEe7GcyDdUJ9Xuc0uOVXR8lwCDw6T8+5IYMOHvB/?=
 =?us-ascii?Q?oPUOlZS9UfTuiKEYsM7IQFiXH18DN0CofUauoh4gaJlJ8FzrbHzanzXwUpDL?=
 =?us-ascii?Q?TONeqTwdIvxWx6GyMv4EwZkrOKKTeAhIcleekJYP?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dabf4d02-2244-415b-c26b-08dc209a911c
X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9498.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2024 07:19:01.3107
 (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: j1iTdkn38hjkoKGP3Y7BxGITbYYU5QE+BDnWXaCoIQn1crnqjmAMJzlIaDotrQL5Ru1OwFJFRMUizuhVc1UpRw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8838

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.

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

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 516350533e73..09467c693627 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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