From patchwork Thu May 8 00:46:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 888876 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010040.outbound.protection.outlook.com [52.101.228.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0673B5CB8; Thu, 8 May 2025 00:46:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746665170; cv=fail; b=lOeIL78k/euPT4KioDs7b3hCwKKoHdrUKxlqj4wUslwUr+dNY4XuSZjDMR+m6uoDkv0V+ezeMuiVa0Ep/dTdHnT6+w8NfnLB42HYClgfk6faMzI7N97I2xA2c5wM30wrrx1E0NRQR5WOWqPRfAJme5WO4WAiAW2oRHuxI7OqXlQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746665170; c=relaxed/simple; bh=EOorossFiqq5KXtjd1r0m5DgB9PdcLzpmb7RxrUBsrM=; h=Message-ID:To:From:Subject:In-Reply-To:References:Content-Type: Date:MIME-Version; b=NEJigUoKGg0KDIq9jbwG2v8xzchh1ni5/ryPgSTOV/X2GtyIbyM1gbc0003K32IHx3b1DzIdfcvUDfesOxMNnF1TKozu8WZ6/FSJO0JgSPoCJHoZPO3VWKA/lHJHd5A86O8qudWY7sNnx0vP/b1FKnwftIRr28fiSsME7aZqfmg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=Ef7stdaT; arc=fail smtp.client-ip=52.101.228.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="Ef7stdaT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WYwK3yyGJFDdY8Ft9vmTvJo7vDMUvilNFTJNb4ZSbsGDRYAhmZm4CHKTBXXwGcIyL5lwPi7XXfVJmV1D1t+oyTrsg35qxJM8s8HgQoodABJuAawiOmq8EfpjtjNyeDwz8BaP+t6UQFGl9D4u0XhUbDFC5k7ZpENt7HVzHmP7K1kZDlhcxXUSxRFWVGV4Ld8fpdXd8IzWKWWA+ptMOMVSnnGw633Mh03AttlQCCkMGMNExmETgCSjGqCvQRivc7VV1hxXcnqURrPY165mvNNc+7zXMAf1cUProGjTuH1GdydkT0kxr4iTwEz9MZuTA7+Yj/vN8Dbkf2UqW/MdeR1r6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=r5LxFvPvuRw8t3mVwmCCtES6bBZDg9Lj/A77MOhnaNk=; b=QM0CIndQRuN2aYXAmNlG6OK0ik6KavUr9mED4kAQbkKEhJwXnRcRaJthc8I9/S6781trGpmsPGMh3FQfugmnJCqmwwLLVh3H42degzzeJzib5G5PBo+ohGwS9JF5hyPQjiO3iCrVqjZ7SDPBLY02VuRrfKzRyswtPDssCH5Srrw7WlCoQV1e5GWhcWVuJiq/1lo5asS8n2WLeZSMTUb+D7qQATubxCF/MqSDkpt9CsIOx1SuulJLSA465zXxZlNaFUNnn/8HW3iW15CPKtp52y+LZ2MZxMWaNK5IfUuBvrnx1twTqHnQsF7uPwbl2AvX+WCBP/fYj3y5aONp11SLfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r5LxFvPvuRw8t3mVwmCCtES6bBZDg9Lj/A77MOhnaNk=; b=Ef7stdaTxdXO0O8Vdx1DAg6KVhD47r2jfdzlK+pJV770qkJY/IVkIaGYx03tSzq61h/05R4EmEUJK3XJN1UmFXggCCiaR165i7qEoqlli1Mvq5FSGtnuKFW4IUdIwSaC57jtQr+F6jZtezH3ac2n+u6HnvSz3pibLyy5vN7zhXQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by OS3PR01MB10008.jpnprd01.prod.outlook.com (2603:1096:604:1df::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.24; Thu, 8 May 2025 00:46:05 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%7]) with mapi id 15.20.8722.020; Thu, 8 May 2025 00:46:05 +0000 Message-ID: <878qn82alv.wl-kuninori.morimoto.gx@renesas.com> To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Srinivas Kandagatla , Takashi Iwai , linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org From: Kuninori Morimoto Subject: [PATCH 1/3] ASoC: qcom: use drvdata instead of component to keep id In-Reply-To: <87a57o2amc.wl-kuninori.morimoto.gx@renesas.com> References: <87a57o2amc.wl-kuninori.morimoto.gx@renesas.com> Date: Thu, 8 May 2025 00:46:04 +0000 X-ClientProxiedBy: TYAPR01CA0236.jpnprd01.prod.outlook.com (2603:1096:404:11e::32) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS3PR01MB10008:EE_ X-MS-Office365-Filtering-Correlation-Id: ea46cb35-84f8-42bc-3528-08dd8dc9b6b7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: +01hLc3NyUGGwtHLo89GeLxWxn3XlXNzIgLJI1OXKvWd4OLERcFwSFlC9AfQ38Uovs4hQX4Sqr3fnH04+4sEZkM3jUdJyoIcIQejkNTpj97rvhufWGeYTVS2mqgwkRYdgthTJvlNdOeCVZ49sd0PhY/xOXxvmWCGfJYABytYPLJzjdNqXReMamtAKECuG8aQdlDFcARZx68YxByoTy3dtWdOhYUFz234bW33BEHKgsd9ksaz196ttW7qjCpThga8W0lZMo+g20rVDjF9PbQ7z5jXWXEsyPO5WaQkXxVcPfObICVNflkAz6zR1NvMnax7NFmWoAC2E1Rqt37RuakdN7wmUHA0FJyLTsBZRJ6vfbD5ijxINziMIl5GF4XYyUISxUBJ59cpVoh8p6O5phA8jfR+vst58yCnl+k+E2dzrXiIkwsuMKlUia9xUjoBaf9G8VtPhhmirSZSxXr9ZoLG6t8nVLJqMbqdRjwxmZL635pnjEc4RT+dz454e++aTOv9eVM9nUoCeLc0JlVqbQbOCsro6m9yDoNG4bgt7OaxYJSNkgT7im8uJqW1D31PdJYyHXJgZfpBbQflTYjHD+9Cx4yH9A2ITO4j6SwAhRiQ49Lj78tci/FanHzfeNwKiSgc7wngR/nLRfs0uSImN5qTSUBAIxuOMJmhe6pIlFoPAYnmEmXXrYKcbVlgpSN5d37DfeDDcqwUfw84+82E9xTSFUTKfb3nBrCnaGEUCdAjeg7hOwjjBDEHLlbplc1tOmRQgxV5BNCCmoipknlrlvbeEwqx8I3l6M7NTO+IMQcR8gIkrjGTTeHkHE5P9UdyUxQSHTHNolgjMwomi4e5YTacYocJbM5qCWV/5eGuJhFgBxD6qkXS5w3ClenhIOn/8VZG0nftLu36GNkhEQrAPyKC2vHLYQP84r7K2cNps0/uZnTNYHsImqQPcEshSz4vy6+yfm7EPiPvdptqG9jo4pQP0ynNvo4gGSnMmGhCE41fuqp/N9J+7OfCPfbs8UoWZNS/wYPUidY1epl/BD3WsN0XuwtrCGwXaG645eJ9E5ES/PikmSJKPMdh7De964IQBCqtgd0rsdCaAHGKyxkPWNU2qopfUsaHqAZU9vCImB6vMSt8ihV/bKNvLo8od+NOh4FSx+5ksX9AQu4jbDB2St13byHFyz9OAXt3GiuCxQ/h+kVKZ2CdgdpaDfkz5sKlOKN41M+9CJ3erJgwptEYClsN9bx27ZHwmbFSyFHxIq+r8FIdv8h5+GuxINYZCUgVQL/Hi5uvisqNmwPr4MdbFJnLYeo50IS18b2nJQwN2j0jZ1yp+0SGiHfVWG8pIjUISGPS26pJ9H8IqNSq3PWQCHi374nP6o5aEtc9ewi5j/wbPGHULUNndmmJUWMzwmE8xOdIydeedSU7Hod9rKHBIAzMChIln5BmQK4eyEagxkqDkxZRBWZNgIVgyGl4nhwiH70IyR/Flyi3wwMlMROMRi5cKA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: s28a9tMExgKwQ7wTJuCen0nnF9Hzr/0RpMS6wnF0WWABb3ZD7OY0F69JT8FtiGdc2GcONRcXyd2VNQQThvb9zLAfSgjhX/6FZHDDdRWen8ygix3cbLGNjZ/XDlECJUiLprlpotIjBm+lMKPprRbUm4XOBOJ9GXSmHFFQ24mxTki3B7gDzeKq6FUTfGxLYvn6p48CGkPRdriPAtjnNO5qKP4WAPZRff/cmIRDQO39cHQTcDns2COWwZ8CAiakY6eGzx4n//SSnQak+CwP8urm7beMPEQELa4A50MisOxE3e+FCP2RCvD2NfurQMACupeSopgluCSRBT4hmsXtHxXEzy40SFffXizMhtsvUW1iD+XxAJW1jTABBlL9vbKpZ5GZjsyU6APelXncnaB5w1q4uq3q4VjFRtJaTsb2rQrMVfTgBbWnIWbH3/GG62AMSNxmvRE1NDbBkv/izEGwVGGEbUt1J8U/OakMJ7rjQW3dNglBbEq6UtZYCBl+zQHPmTPmxEa6rLd6WsnaUysTHbOC4RQCHe/yFELVlRWaSokL3M/OUKHnbjTDlp5EFsxfGjaNWf2VckXLukd9w0nMA+107pqvLyr5VqUrMapUfV5FwYIYkxTTcBtZx+r/kbK/cA37adXWS6BtUOB7BTzAOQsJM+nGvaS+HXSa6VDranKT5jZNVh0/8yEkRe7fuFpGo6Z56J3lHy2KfHXYy0vJx+eBBPctYu+QYBHwdMQQxzsGhncdH45FYvZf2A6d8kNYIj6akhlwRtncK15J/Mo9wPtxRomwXpXE6bXFd3bXFMRkdJYyxcSC/DWSvQrGj/+kywqSKPc3tX7Loet6iD8k/6HmW2YX8nhFNFiA7+SKdT1iJRIDkWNf2oVLKKfgTOPe29LDZoIuHv0gUP3dVAs2kQHD7jkTOR2kKVSGYQHxZcw72lU1opqYG6ofD8L7sIQhNhEDXTG+/wPwzAKCLTJMDnH/Mg3ku5UgxOOVpUTMxGRF/VoKljEUmA7ZQIqjAtdKCCDmYXVn0pf+OctK0HDmvPn9/7qsyHD1xgsOnOIjuectaXag3DeMJ5voBxY6ZT0fmEWgNn9RN9rBlzflbcap/GgEuzLuEH0jFUfcJKF0l4oBPUT3m/EQJP5C22YnsglkKOWkH2wIO2Uq0Bxk1QD1nrQl8DZ7cDoBr0XFEmTFLWEbpZSoDmCFC782SNbAdsuawbLPKbdLXYPS9A4G4P6ZsEJjWzvkIWCVL9efzReZUMcF2b0RKCxXV/wTGvEo8YO11T0N+YvRhuYDpIXh9+nZf554LvnDBzhgmX3XB2qpzW2u+tdlS3fJa3S92EGbJBMzaOpamBBJlUslwbzg6wBqvTPEr7PqOLHt39GYaJB51rKcWqEnivKlZz6HTR+nwd8/UnmSM1exx/JsoyNdvjkPuRld46uQXX33nuspkMit83cQo6uLDSnxW92PIK44q4Ro35WeXuwJMoIkfeZJCe/BHThQHsv1PZI7+NNAWtG4zFkoc68DPNlvUcSqBB9CT7MKMzqCDCZt8kHlnRH2loAaRwKVL+b5KDrnFJXb6Bfzvc8tb9ush2eGB8Kc4QFTsQFBj7Lt1EqUJvEGOhItegpSxrmKZ0aa1EBcDvRmSCnHt4tfWgE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea46cb35-84f8-42bc-3528-08dd8dc9b6b7 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2025 00:46:05.1060 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xOiA31l3wzWp+kW+5Pc/rTCEoBP8aX8QlZqbmdb6zA16PQ7vYfRqS8VipZRUVzePSxeTAvORFt1QLdi5Mvx6zC0IKGw+ZNl+98ZygiK43oDnXXD/zzAG86yQVYihaOu4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10008 qcom lpass is using component->id to keep DAI ID (A). (S) static int lpass_platform_pcmops_open( sruct snd_soc_component *component, struct snd_pcm_substream *substream) { ^^^^^^^^^(B0) ... (B1) struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); (B2) struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); ... (B3) unsigned int dai_id = cpu_dai->driver->id; (A) component->id = dai_id; ... } This driver can get dai_id from substream (B0 - B3). In this driver, below functions get dai_id from component->id (A). (X) lpass_platform_pcmops_suspend() (Y) lpass_platform_pcmops_resume() (Z) lpass_platform_copy() Here, (Z) can get it from substream (B0 - B3), don't need to use component->id (A). On suspend/resume (X)(Y), dai_id can only be obtained from component->id (A), because there is no substream (B0) in function parameter. But, component->id (A) itself should not be used for such purpose. It is intilialized at snd_soc_component_initialize(), and parsed its ID (= component->id) from device name (a). int snd_soc_component_initialize(...) { ... if (!component->name) { (a) component->name = fmt_single_name(dev, &component->id); ... ^^^^^^^^^^^^^ } ... } On this driver, drvdata : component = 1 : 1 relatationship (b) (b) struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); drvdata can be used on lpass_platform_pcmops_open() (S), lpass_platform_pcmops_suspend()/lpass_platform_pcmops_resume() (X)(Y). We can keep dai_id on drvdata->id instead of component->id (A). Let's do it. Signed-off-by: Kuninori Morimoto --- sound/soc/qcom/lpass-platform.c | 10 ++++++---- sound/soc/qcom/lpass.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c index 9946f12254b3..676018b8134a 100644 --- a/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c @@ -202,7 +202,7 @@ static int lpass_platform_pcmops_open(struct snd_soc_component *component, struct regmap *map; unsigned int dai_id = cpu_dai->driver->id; - component->id = dai_id; + drvdata->id = dai_id; data = kzalloc(sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; @@ -1190,7 +1190,7 @@ static int lpass_platform_pcmops_suspend(struct snd_soc_component *component) { struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct regmap *map; - unsigned int dai_id = component->id; + unsigned int dai_id = drvdata->id; if (dai_id == LPASS_DP_RX) map = drvdata->hdmiif_map; @@ -1207,7 +1207,7 @@ static int lpass_platform_pcmops_resume(struct snd_soc_component *component) { struct lpass_data *drvdata = snd_soc_component_get_drvdata(component); struct regmap *map; - unsigned int dai_id = component->id; + unsigned int dai_id = drvdata->id; if (dai_id == LPASS_DP_RX) map = drvdata->hdmiif_map; @@ -1224,7 +1224,9 @@ static int lpass_platform_copy(struct snd_soc_component *component, unsigned long bytes) { struct snd_pcm_runtime *rt = substream->runtime; - unsigned int dai_id = component->id; + struct snd_soc_pcm_runtime *soc_runtime = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(soc_runtime, 0); + unsigned int dai_id = cpu_dai->driver->id; int ret = 0; void __iomem *dma_buf = (void __iomem *) (rt->dma_area + pos + diff --git a/sound/soc/qcom/lpass.h b/sound/soc/qcom/lpass.h index de3ec6f594c1..7663dafef18a 100644 --- a/sound/soc/qcom/lpass.h +++ b/sound/soc/qcom/lpass.h @@ -93,6 +93,7 @@ struct lpaif_dmactl { /* Both the CPU DAI and platform drivers will access this data */ struct lpass_data { + int id; /* AHB-I/X bus clocks inside the low-power audio subsystem (LPASS) */ struct clk *ahbix_clk; From patchwork Thu May 8 00:46:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 888637 Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazon11011071.outbound.protection.outlook.com [52.101.125.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 401665CB8; Thu, 8 May 2025 00:46:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.125.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746665174; cv=fail; b=uuZ2ubu/3scJdsVHahs+YANMfIiTri3jTBHZiLu5spzJL0eYVdEBw3DHdRQl+S+qDJJusDo5ooa9AQ6uaZO+yKepkInt+H82ZVJLPOvrfGrapvdAcnrjpaVCHyvVt1oA9RkREP5ihDU63DIV7hO/ioQ7TMU7eL66DxHcrbTFtE0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746665174; c=relaxed/simple; bh=dgmqF20lsqBYGneC7A0s6abi5whSKqU7yo4Ur0mpvQM=; h=Message-ID:To:From:Subject:In-Reply-To:References:Content-Type: Date:MIME-Version; b=Ux3nVjJFTkvLGFbd/ydQTBArE4opTwczj3TtYsZJlzS0jliqxRkNgjhy+WDTyjvgDvGEF1mM7rHc4pkt2sdicKo5zudDy4Kl2B4aZwg4Qm5k5/VnY13TCLbOzUCE6z7xl8sq5d0nsDogRKW/asmUIBeJV7EB3qwQB/bBmXniCUI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=V2vEcPVv; arc=fail smtp.client-ip=52.101.125.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="V2vEcPVv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jO/DWdIjH5rIYUMLFEVNhWXXrF2YvVq1/WSQ6bMQwbVPbS7Gmq6LtbaKZeNF1FlsOt0qHyyjxcsUR5h2s9eBF49wA+Z+jI0BCJbLCV8Ztms9RWWgrFh5KtI4vhj7o56tOyXTyCQgQiLfb941YCvXusKWZ+rv8YtVw1zv4xFT8wXFEXTyj9z4PkMhYGoifAhEJXAkT1EEHoW9eaTsRv1PIqpN/25LjxNqjZ58gUG3AkB3QHptEOW6w68Pt/+Nr/UYoO0py0UumxTVQo3S80ZxGhiMlAJiaMdpgJsFBPirfM67xQPQNSJ/Bfb5649dlxtnR5fIJ42Kz47RoN2pFrhfTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ciLAlXvDRxBVMITRaB09Vu8w/+qP70OscoG9vBnPUhg=; b=WxeueiWZ8EQ9raJJct+d62zIx1WbvX3oFwNNKjno9bWVLMSoez6jZllAOT6KtHLM0Po6AMFw89F5JDHUCqRVQpWJUxhvDHyEnRJkXKnt55TQ+T3OWkbjmM16gDBT1mjRHW8UeqAgCl+XKIKjIjic877Biv84MFU23EfBgL4jzbIObfgwI9PyivYpffIUX9Xvn4JcdiK1/SDLRurNcN8Rd9VtR4DoMfIftPl2u4cHjgz3i0e/JUToXSjyJdcwkSxs0N930f0Bs6nujSFzCXVgKnTszDJqGlJUYgBqLIYLvG35KrHtkl8gJF+dLrix51NyVtatZLjdawjcorfPZ+uRDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ciLAlXvDRxBVMITRaB09Vu8w/+qP70OscoG9vBnPUhg=; b=V2vEcPVvUililBULm+dRIqI2CenZZQUi56h8918BHOuAJCz3e0c+V3TLjmlv6UuaKIK9kK2aOluirKB0UhrKZ1kp36FWR6fPzdw/7YNEOkTXHmtaqMhiS/WZIsSnLHqc+bnHsu5sGPOzHjhLVL09PfdSxG9EXtqsYmRxKU1Ycac= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by OS3PR01MB10008.jpnprd01.prod.outlook.com (2603:1096:604:1df::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.24; Thu, 8 May 2025 00:46:09 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%7]) with mapi id 15.20.8722.020; Thu, 8 May 2025 00:46:09 +0000 Message-ID: <877c2s2alq.wl-kuninori.morimoto.gx@renesas.com> To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Srinivas Kandagatla , Takashi Iwai , linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org From: Kuninori Morimoto Subject: [PATCH 2/3] ASoC: soc-core: save ID if param was set in fmt_single_name() In-Reply-To: <87a57o2amc.wl-kuninori.morimoto.gx@renesas.com> References: <87a57o2amc.wl-kuninori.morimoto.gx@renesas.com> Date: Thu, 8 May 2025 00:46:09 +0000 X-ClientProxiedBy: TYCPR01CA0159.jpnprd01.prod.outlook.com (2603:1096:400:2b1::15) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS3PR01MB10008:EE_ X-MS-Office365-Filtering-Correlation-Id: b5f3cfba-003f-46fc-926a-08dd8dc9b986 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 49nASUQqYEKg/tk1Hh7YIv8XiKyBjElY4TsCBUcIcpQbtN3FxRBJ518CYx2igp16OOM2s22vYkisuDeU8o5FCF3V3zNNSuE0VfU7Gwh3pvn90IfbCKu0T7eoVN6kwNxQ9fwwD4QuzC4UIyyMpEPg3d8e3Z5Y6V4lWsmtuuckuhIzF23nSP+u/VKlqCI0r4bzbugcL4PjyMYg264tw3hfEWaeRqMxQ7vElz6bdqAVIEDSruZi2oaQt+DPJevXhjWjhdANRdZUXb+xuD70kfEuYbfg1g+R6xXuEs29VA+IZSwvnNEXRO7gFvvmMww6V6yiRAhj0zz4EdMWHCv3Zh/QHiyzWVAIhqxaBY97IFYhkZRAk9i9N4WonZJ3awmKNlYGWfOOGIDMFKvrwhKzWbEcb9errAt8NJWWmjBKk1Mx1X9AK+ONc47J9XGgVNNt1nqwF80ZAYy/InXOAP2ZtdzeRZluxo63en2IyCACm9HYYDm/vCgBoJs+rAjWmf/tV1Isb/HcOG2DyVfbZVe39ahwHvUlOQdSBU3bo6sLqKJhZPGh1dsTp8FaVaM6oV27FMhb5jQbdOy5aw1WRRyFhyNpDHBe79RfXYSQpCNhR7LOPMOUarFAhVEnJjnT6FiRg2yUC/B1iINh8XaQ03dEwVVu2BsKu5+OO9jcpYahxaEyvgYJ1XTjhqqNmiSCdcvJLgXOZzQ9upnwSCFxjZI0F3mn2BfGyvaZyhaw0yeS0vVChjyKUXlvne68bUf/xyhsguaaCyZNkxMR7kNUtAyzb8Skpl/xlR+9bZWxntQjBY7s5uz5rdLmyozrTpzJSlps51IlgGmafFJgPiORuq+cXOZrjutx+ZIi1EPAdyapmdPrAi7xINBPwICv4K6kNQCb1yjG1UQvSEJTuLCBvy9R3nfDsMvi8NG0JLwOMfGwcOaRwbAqHJGj801qCpX6eIu79RwsTr4DJOrRgqdC7sOc5/L34SRaaQe4MVR4MBWn7BfAWvNfmSfVkUt+Nbza9IQ4X15oC4vwOG0SX/vYUN/6ydUUPLARjYKV7Qiscl0/4ZlMJrHaeBKSKQfCXmVkzJacIhatST5WETmY4YW/fO8OGHfFtStj6Jx6DwTY6my1E0hesLb88PuOWzAJWq4EXqaMpWpjNWw7YYMDywOw4sWDfzVo2gA9vxxJ2o3lLPMvBDMDT7fdohXi8oVbYan+kS90x9uSdLCKi/uOJoZjeEC1i6sxyvYoW1fPo4wZK7v7+o1HlFEakfMbulFXjgX1e99qt7eto4zAJlhRDOifsUzKurxEyEKmmONCoFEqah49/Lfj3qLrsbi8ILsrEMI9Rg8gYc1Eo0qUJ999KugqC7blvikO8mikR8CclEDSZM73n9E4FA5pKODcBWF49xUeu8P0JEIi5GQOHT8I5PGqgslJU5xrq89f0JneBgBarDWj9Ar9KvI5W9qb1gkP2TpVOg5xXFIGQ9mgsTfYYrnuWSMqXEHAOQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M9oHTFvU81mI8MXSoSFSez2gNlz0vLRhGzuhgZsFnDfX+5daEeJ4ll7c3nMkUrD04mmQez8OwZvWc1fGL5ylG+7TA4YppQhtvfKxSjtr8TkC3aF+63UC/x/nJGu1gsVsT4ljLyQsj9ARkUJy5IHVgzmXf89rgouFOEx+UfuvzuHU0ab38VAcjX/YjRxHQJvvgdkY33sXHuBLTAZbqvMwOM1o94BzD5kW7OwwOCbSW8S9+Hfdd2fZguSwE25eowWwXe+pykZUPU7QKNKmxqrdkDly0qN1r09wrUlE5xU8TkDAdYeIjDO4l4JMfqyLQGHawPippcf9e02W9msnIHj/4yagWAuKwEvYMZLmg2NBtCMk+AsJZOXc2r6U7HZm9coGnrKukUL1M8dTQ217JUPMfe25fcH9qoseWlpLfSN4qHFppMsWMVqU4garQnz3cmd0qTRfiXTKYwwuJDYa1DGlho6hnz6FKS45IQV18U+RDQCFGmzYcn+BNck7eQi6eYwZcGT8lSlPNvsjVdqzB0IVAiBXhyMpQ46UZSd3TXxWNIu0seqekhp+yE/TcOsaNOpSBuL+1cZIkhbWIMGUGKc5PVji3hYUepj57eufgKUilyH2Mzy5a/A42WmCno5eF5Kv9HmCDAQ2vO9SPws8wZycR621NDOJX0l2Fd/mI/w8OMLIcOxfidzORGJp05XftOzjTdr3BsnCaMmXcxBfOBc7IGc13vsTLXrLTpCc/zGdnX+IG5O3PNnbz2uSA0LsG+esFhV+BaKZxKe5JAQDBNWF0RuigEUK36u4d1hmu0lI7zqf05H1YT9a0EJYOldZ2xWjZ9nI35+v+RntkcnQCkTr246gT9fU6oczVrYx0f33EHP8BatpYv5Nqd4OGwMKvhueAFVUJlGPKvbyNKXVJvPodyUowaZpeJ6c7heevE999F6yh2e9o1fxvPsLVa18CcXQuxXlqcrPx1A35CE6HbVPfyuXyUj80YLeBgP42pIDNwFe5eUat1Zw6Bh4/8EH6LbXm09izMHoXg4G7l62gT1kcRzu0fOypaffP2wxCBdkerkGS35YPpziN7bjV+4hyFNbAAfUNip+WvTwkrFcqvREo1TLP9BMQOWdi7xXPPhSaPWELLimrOuWoyFCk7qoICFrHWerbMDYkJjE2Q6x/eQkSoUKtEn1ds8aEOuEG6/MauV99ZNo83QrPWnOOwONaudAQN5nU7D+D7zI3YWd0spsv+b/0+Qfc7BhrT0o2oG4Ok3mdShMkfJ1CCJOBh7IAZ9h6eh2CbnLxxTkzhU2R6zQzfu6fNiyRUhv3n55oQ+rlIRpSaz+NCH3lg8EgTi2NkTMf/7XElLoxnLZqLWPcYJnvUbK244NybX++h4AQ7UpwX/fWIHWxED9ExVEPLLkaWuDw8i93Etkq9BelltcoqncYUx46p0K8fxE0TiKPf7Sx6O/8QVPGgCRte9KWDnViJEuMIemeDIgAWXgTswKdrafgVhSaEiSdkmUIc2RutHVNXV7qxJ6kU7pUav1F7V6ePASuQxUFD7Erb1WdKIVm8Y+NphvVM/UO+A0dZJC4Iq0APzYCgz0Jtpo9oejAGY89DemoU43BYJXQwrq3KGe/AOXUtLeok8yWkVG7qQIOt5gjOo= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5f3cfba-003f-46fc-926a-08dd8dc9b986 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2025 00:46:09.7937 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: AvKhQ2GYGzsxQrBQjUpbmSvtBVg6D0Dryo8HVYCfKgFE06V7jrqQt9ALPB9BnBaEOQOOqwE0ka4zKXUNRc5OLOyqXGwcMGRhAlEB4q+OTPo/qy6vHLQCoIPWCG4SRLhr X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB10008 fmt_single_name() requests "ind *id" and not allow NULL for it. But sometimes we don't need it. Allow NULL. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ab615ec113d2..80569209ce05 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2604,6 +2604,7 @@ static char *fmt_single_name(struct device *dev, int *id) const char *devname = dev_name(dev); char *found, *name; unsigned int id1, id2; + int __id; if (devname == NULL) return NULL; @@ -2616,10 +2617,10 @@ static char *fmt_single_name(struct device *dev, int *id) found = strstr(name, dev->driver->name); if (found) { /* get ID */ - if (sscanf(&found[strlen(dev->driver->name)], ".%d", id) == 1) { + if (sscanf(&found[strlen(dev->driver->name)], ".%d", &__id) == 1) { /* discard ID from name if ID == -1 */ - if (*id == -1) + if (__id == -1) found[strlen(dev->driver->name)] = '\0'; } @@ -2627,16 +2628,19 @@ static char *fmt_single_name(struct device *dev, int *id) } else if (sscanf(name, "%x-%x", &id1, &id2) == 2) { /* create unique ID number from I2C addr and bus */ - *id = ((id1 & 0xffff) << 16) + id2; + __id = ((id1 & 0xffff) << 16) + id2; devm_kfree(dev, name); /* sanitize component name for DAI link creation */ name = devm_kasprintf(dev, GFP_KERNEL, "%s.%s", dev->driver->name, devname); } else { - *id = 0; + __id = 0; } + if (id) + *id = __id; + return name; } From patchwork Thu May 8 00:46:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 888875 Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazon11011002.outbound.protection.outlook.com [52.101.125.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 377EC1C695; Thu, 8 May 2025 00:46:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.125.2 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746665182; cv=fail; b=AOvzLgrFVGnG4J1NmwQJBCnuYe6AMrF4IGkysLggUibJ+YzVwQHgY8CT42hnfF8KMHqCFNZWKYdMaPXTp90C0mRExtl3WVuz2TUBehPHccz9H+2XjEmpvWObLlVJ13TN+I7Wac02pfPWL9LgqiH94hKTN27OkZchh6m/2CPm9vQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746665182; c=relaxed/simple; bh=veeCoEQFfSokyMumxPgsYs+82nlvQ+pG0hejpKbDdhU=; h=Message-ID:To:From:Subject:In-Reply-To:References:Content-Type: Date:MIME-Version; b=VSzA+duzjaPwwNpV5VgtPbIkIs82gNqXBkehWqZH7GtRRtFP/QFme37r0HECWWK2V2+9PuMD7zyHLtsTv1Csn0hUtEl5V6q+8f+eRW2IYHkUgTAjmFtmYD6ofVPfrG5pVB+ba9AnpDi8vnFCEf12ryP4FTqe1wTi8NlzeMPhl00= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com; spf=pass smtp.mailfrom=renesas.com; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b=cJ8qvMHj; arc=fail smtp.client-ip=52.101.125.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=renesas.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=renesas.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=renesas.com header.i=@renesas.com header.b="cJ8qvMHj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JwTRkqibbAoyXjjaRRx68FjDxP8Pyswlm53bEShkiPPDtYlmLxYyFjZcML8aJz5S4L/HfcdRgCct1aYta6w0GYEKusp+9m/uQ6rFM/QKv3Ogi714sDCNQPKYsccEnJgwueJTx2EPVq9KeUqtaoPfHKHnfLEe4PgHJ40MJA6I56ggGRjoTVK2npY139hX6oR5hX4ktURpvcJDv0p7v84DPyFWYKhzrz/4YZnfw/wZlxcuhq0YvdSkioyjmgE/9e3VH6RrxyojEclv9Ktg6pnkbCs7uGniJqEsk+t7HuqiLnbw4iDt+bUPBpVMoXC6snKURSKd0jp/oZckpQ5HtFyhkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TrqxRQOlWmlKWz/hS2KESntjZJxW8gEnaOKKgLO1DfU=; b=U60aUwLxW17RjvNOlcwIX1S5SYc9OZvehUWnmDbDeVkT/V6iBaPehL3hoR4kmumb9AbwMIURlNZjgx5VTe6eu1B+Ke/QOifStLG70bLcCGHgGqQQcw5KeJWG4qi2mpnOXJxDMj+hxHMBcZUQtIjRi3PpwcfouMQeP/zx3E1Mh9kcsS5EOWrfH/5qMt82wayTth60H9wtJJmZ0g33Sq/JpdHtoyvE6Im+faHC4auVQHAPSxShdQEfTQdR60hyatXad7bdSrWk1eN1EBl+0AKNdcpjU97GC369n1XpyWOt7hEMp3BqwZe57+t54KGamXL2tMrYcsltvutbapQktl+cHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=renesas.com; dmarc=pass action=none header.from=renesas.com; dkim=pass header.d=renesas.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesas.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TrqxRQOlWmlKWz/hS2KESntjZJxW8gEnaOKKgLO1DfU=; b=cJ8qvMHjII0zbcrIafJ5Hc5m3wXdJRsd2MdEf9h5dOr0RMsboqmDlAmNlWECMHv5r4GwhXGrLSBQ5lJF1heV+gpRFE43o1q+r3G/LOHTvC+nJuNRnoM0mFlzevPsSqXBsp1K/zP0MmgOJy60HF1GuF+zyMu705kRIQXPzbvqOXU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=renesas.com; Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) by TYCPR01MB8616.jpnprd01.prod.outlook.com (2603:1096:400:139::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.20; Thu, 8 May 2025 00:46:16 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%7]) with mapi id 15.20.8722.020; Thu, 8 May 2025 00:46:16 +0000 Message-ID: <875xic2alk.wl-kuninori.morimoto.gx@renesas.com> To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Srinivas Kandagatla , Takashi Iwai , linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org From: Kuninori Morimoto Subject: [PATCH 3/3] ASoC: remove component->id In-Reply-To: <87a57o2amc.wl-kuninori.morimoto.gx@renesas.com> References: <87a57o2amc.wl-kuninori.morimoto.gx@renesas.com> Date: Thu, 8 May 2025 00:46:15 +0000 X-ClientProxiedBy: TYCP301CA0034.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:380::14) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|TYCPR01MB8616:EE_ X-MS-Office365-Filtering-Correlation-Id: 3207a641-2f14-431c-f062-08dd8dc9bd3a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|52116014|376014|366016|38350700014; X-Microsoft-Antispam-Message-Info: oc0wtLKVo32nnlK8B3MSQVODTMA2DKN9FzlTtjapijx253CciE65wUfqXLGhmi3bRGMwW+s8I9KjaNC7DTpsYkNK1QTkmsG9R7k+gGGC5G5fLa+Ud50lOXeOmAishwwsOKUklJ4ZzvXGcBll4DtJEK/DiSrOFgnkP6Lq86YxCWrsGAOXDWxQG3uZXDygwCmM35we/rgIbzhr/vi+oIzTO9j+lKf+Qx45Vc8/m7xSYpnhWk1rN49rADQzBdu0IuzN3LQQBxBhO/8oR0vPv1DR+Q+L9X6yP2rr+GY8ako7NNwm0oTX+yVud7Rk1tz3LzQwsVuZjHA6dk+X55uvn+1aeEhhfKOnNBFHAtiHwgR8/SqzGmqS4ADf7AfJ55rdp0lOu6/wIHO86bWkZBjCPqBeM5ch19tcaToa+c0YnszGx/icIJMHUVJpsfzgfcvidmboT057Cq0B1c6DtRn+BF9DoVXYUjxYQ8ysTmVGKbs6hK1Atr+c7WMcXbn+IAP6c5f0eCuqPcUdN+xyHR+g8YGBKsjVF8FkUGgwpl00ZvBn/aBkrUEOOwvRCS5wg2UJrwb2vSC4YCADtAuXI6c4wVdNkucvxHuYK0E91ySGDtdfiGFA+ottW8Drh4vkGrvHCil+4nHCl/rrcT2nURLz+oQ7JTpyeFj7yi5pLUnQXT3TxHOyRZrsmlkuEeMwmGTHQj6+mHXPr9xE3E64JOFGGz5heU0139dqVLBgPfC4INsYMvWddKRQaOEMhrpnUES/16asZtmyAyNqMtjKUHxLNoiqOohyTjtSW6Ca+ledMxdgMfygIsh8RfRXESQUUK2dtmtckQSlUYp/HZR6v6HZoAmTeV9IR2i7XfazS76ceAyrN733GXRqgz5+fplkCI66VE77SPHQenlZ7hOE9YhYH8zLR+4MYM4JqLJM62Vvzmfy9mKUuSwZR0Ha4FpBK1/N6YMv2teTV37mbKjKZYCWMaF/3vJgpDfAGsfnxjmX66+ZKA5ZoQyMGOigDqL7xk/O+gsNWRBvu0H+dNr9zMmEDh+aGfzGT6sbeobSXniUi8PGt97QpWG1yo5lQ5HbfW9idqbhnM6TVPPpWfkfdntBGTc8o+VoS9OD/s4Y9FV7LlydrBecmZgvHgNK74vXY12kt6STXVIWOvYxBoXBqAGa/kmkOc7+sKlOJOCerGqhy7bIqaW7Cm/L7n63+sgnAz6n4vXEw9wyKM0aEMOjSrV+GGfej21F7KLwHots8QG/NUqZ489p+zHnee/GGz8mPg0xNtJRf7VqB+wLhbaIWxvOnB7aLSagMHJbBtstz5rlP4H4oHQlsj0vQuBY3esmrMc8zJ5MQcF0b46ghtBwJC42xrKwNHymO946CUHr3XC1151A9c42L/r83zRSR0ObstQd1iA/ACWXsR3/pF+hiF/5PTAwQyni4lwfJFROzIa9MvqSRIE+QkN/Z62l5cvFrFL+5Sv3TsNNsYIHkKan5B5ojMqiew== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TYCPR01MB10914.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(52116014)(376014)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0JKYC9UhS6cmGO36qeCR2c/JMmYdOptiIkdjD/Ogg1Ww3K4fwPxhoOuQm154UN6rHGmecjkvffpjoty8MJQUoXiov7jWMgbs3MW7mpH/92K8JDL3XkPTZC5PdBvGNoec5mX8gnGeHL6BW21vN1o7R9l+QXCYW5rCpgJnJMRVVKp7HAvYfWL45Mr2xKns3ML/V2yvvSN8wZo0X/zUO4HTo8ZDeU0aGkkT+38UnRa4DNvaXqC/4XRO+cKo7u+98roq32eEUHjsVInZJ8K4WRRWGybQ6h2yHsgGakZl8LDYouzNJ3u3iKipGW1vkJhHaq9n60cd4FhdrhjIACrtR5N3g9y/QKQyF6VNKRnIhwn+35FprjKoJ2KgLIWDohCJTFDEVRJvtqf6Nf7Hbmmid2U1lCwisW0N6TxsFUdsc8SIY2ut7SusPFT81ZQZ817ypEuslvlwkjgGhAmuA85oU5qX1EgTcH6HwoUB5ZXV9dve73AZ+i5nCDiVc60UWn+Odq3ITI2vk3ZQgK5C8tn9so7LPvp9GKtE0O6yrIOnD8I2dqYyqWKiHrsAq8vXW/hwZgrBnSVO7VmoAc+m5LD5xW0DwuEDHwEL7fElUC0m3cEnKHH/NgkyiqagigTKYKr4q4jv14brB+Vgl4x3nbvmO8nnhy4z2RW4DePMX1eoczSCAZNU3ce/UshwpsXQWwPMiwPRHzxgxjMHx/gQioOspBQwva2oErYwn3eceybIknBdKVZFXnJt6UJM0uHWFIm85Ih4C6fhqFdKCd6gwD94drS/tQY9z5yhw1b6w/tCppBuBr2F+0IQDU/1z0D7eGSdL8hOzUf/TlfvRX7KQ2O4Ht9cbwS4tBSauLker+i76EEgB3n9MHF3vuZay0GgkqmRDUq1QAYMtVH0SePapDXkiu7pvkaOoVmOGmsJVmJEe4y64ISJtndryViyXBtEF/sxg7H0+C61+aF0cs/V2ubOlg1Yn6IxdrbBrEyP5YEzyuLIT94OjKza/NueN4qOlL39HNV2A55eR2D4ZizILzqXjYomdUX6/2OTWrcAWaDQWDM7TWA4hghv7++AllZUEIOckeqANq+5QGQRAjrVbP/KjtdfbItjvmMYMlG1kkVh0GmRNh3pvolfXU1pA2kXxtlIh83TkNHgMVXIvHbBs+OoWzL8oJzc2+UP9pq3G7B9i+RGChlc/REE++D7pl4Ez2uPpifsc98t4BGdi9yFpQe/NyodclyU21dMoD1nfO9oogPoQn7mOLhoTD1bw0bbOagC/K6cvzIyzDC2bUYGdcVsIajjO9aOpJue63ie8zcdxaA25Ltzzxkkzm3kbkpufyVrCzvx8gBoiK1qenm5+EpFgEqMtz93C63B0ArplIJU5YzFGZ9RyXDDBr8V9UMWH64UilTLd0uGZlYujSbqCFEoQH01W5o2zbSpjL06Gz37qUQZYS4dTHRZ5gSRQWpBtsTXAvhaIa9JVCVN/io7YJtNYNWN9Rq2I/411pclI3R0AU3y7Guei5pSJSmpFSL3igOfjqpx+SN/8hJel/AWK+HnC8bWIPBxTELEUK3B8E9K3Hg3YCnYltsL3NKpQKS0NXrluW1K7tsuWLq8vnFJfvTd/tLPf5mDtyXiRjkp20JKAWMT9UY= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3207a641-2f14-431c-f062-08dd8dc9bd3a X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2025 00:46:16.0310 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nspYRlnvuHeP/6PQNb212wDFgedelNGZuIC+0sykFM7l/W+tF3lNxtJRp21Ouno7bOBPJ0k8Vy8Cin98KyfBY6JH37Bz9RVXsStoC+uYrAqzLWFadJSR/L7BkcmYweVg X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYCPR01MB8616 No one is using component->id. One idea is we can re-use it as serial number for component. But we have no usage, so far. Let's just remove it for now. Signed-off-by: Kuninori Morimoto --- include/sound/soc-component.h | 1 - sound/soc/soc-core.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h index 61534ac0edd1..2caa807c6249 100644 --- a/include/sound/soc-component.h +++ b/include/sound/soc-component.h @@ -206,7 +206,6 @@ struct snd_soc_component_driver { struct snd_soc_component { const char *name; - int id; const char *name_prefix; struct device *dev; struct snd_soc_card *card; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 80569209ce05..39ecf0123a44 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2835,7 +2835,7 @@ int snd_soc_component_initialize(struct snd_soc_component *component, mutex_init(&component->io_mutex); if (!component->name) { - component->name = fmt_single_name(dev, &component->id); + component->name = fmt_single_name(dev, NULL); if (!component->name) { dev_err(dev, "ASoC: Failed to allocate name\n"); return -ENOMEM;