From patchwork Wed Jun 4 02:06:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 894044 Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazon11011008.outbound.protection.outlook.com [52.101.125.8]) (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 B5B8B1862A; Wed, 4 Jun 2025 02:06:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.125.8 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749002816; cv=fail; b=DZoqTh54lJLCm5ii8vEjsQIOS0J+ltfFak0ESAK16DyfvyVzXp1phV6Zh6MkKadBRhmJ/h/DHnJ5oqkF1xzUYTMOa4JSOgzQnyQ9Nxd9hman3T+jxCmEbsvKQimBMTNkshGXeDRQoinYCY3DVWPqYrQ0B/PALcztzaRJuf4zs9w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749002816; c=relaxed/simple; bh=afC8pRLh5ZHy/igJ4cgYdE5wj6l7HB4CV325qG5RmG0=; h=Message-ID:From:Subject:To:In-Reply-To:References:Content-Type: Date:MIME-Version; b=miwJI6jRpa0obasF9MYb/yl3bPaBt8iTQAklmS8KOa4RJ3mnOa44SbgfDIpBygpu2fKtKOKxAVVJXNSkTBvXMsroPRpfP8uZdqXQXCyUYKmoqF8d/+A+nvJNzaVnd/nZ4Oh27hDv3c038rUwitVYm+773vuLBpHqvY5M8QXucPQ= 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=eAkmCrhw; arc=fail smtp.client-ip=52.101.125.8 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="eAkmCrhw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uQqoqRvewknPvfvRMjfxc2JyKCMoDCl2dvov6J9glfx3fL1IxcEXV0EgFj1tNUH4HfrGHooSirsOFp+PT+bGqDLvnxnSh+z7gVQq2/jqjKpB4CgHHOhA7oTmMZA5haUjs5CHe3LqWOO4NCfxS0tCoOCKTn+o64mzX2v7lXyV1lb4nmOquEbLooHrJWQjR+YsSrk+tlgBvBW5Or/57BkMNVT9NmE4x4gEZA0U8ecd4cp8BNosnJDLgl/ER9a5vOtxrL848SBKSb9ZOSua29U37OxuN1WkNTrXtkxJBTYjzZ8vr1Y8bwO2kDFgN4HMaYjGwCmTEEKet/rM978LkD+diA== 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=p56enTjBHJI0GDi+KgUPkgaxB5WRAtXC//u8h6eF9J4=; b=gznBSJ6ny4fuxzkFnSxcJwMH4JNm1jZZZFDrVsG5A81CKYsdD4tiM/LF/aQuDWhjOEj9fX406nDQVavYSPwtiTyx+/C3Dn3XKYjWFmHA3TfrXf3lgl4E9tMk42NG8ATIuUpPUb9BckLXiSMc7p2xH8IGXLdgndUcR7qnTgzwQGXBkxUiW9lxPcyqumPK/7sAojLefcVZz1nBYn6kdL+B0ZiggwPg2+OLMH2aRLCvqtjr+Z85oMy5Xra+N3lv/G8Cz8cvFPlvANeQHHDdhFokm4HA51hZB9Aqj7Xi9ZVq2mAod7IelxOTtr417cCRY6sVgvHnU2wp67DK58mwvBllEw== 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=p56enTjBHJI0GDi+KgUPkgaxB5WRAtXC//u8h6eF9J4=; b=eAkmCrhwMxRZoAuAf3Et/LjsGiQBztDIs/QqdGm5v10XbJUzXojWuVT3wpYIfaDITfO/RGyv1gI4XzXUQZ5ys3S1c6B7siNy8yzkgAuCdjgYIY7kNTWyHx2HsCVm/WKOaQN1i4zckygkhKNsnba8z7ydn2gDFarmRGZPNp9XF9w= 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 TYVPR01MB11277.jpnprd01.prod.outlook.com (2603:1096:400:36c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8813.20; Wed, 4 Jun 2025 02:06:50 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%6]) with mapi id 15.20.8813.018; Wed, 4 Jun 2025 02:06:50 +0000 Message-ID: <87a56ouuob.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v4 1/3] ASoC: qcom: use drvdata instead of component to keep id User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Srinivas Kandagatla , Takashi Iwai , linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87bjr4uup4.wl-kuninori.morimoto.gx@renesas.com> References: <87bjr4uup4.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 4 Jun 2025 02:06:48 +0000 X-ClientProxiedBy: ME0PR01CA0030.ausprd01.prod.outlook.com (2603:10c6:220:210::17) 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_|TYVPR01MB11277:EE_ X-MS-Office365-Filtering-Correlation-Id: 3804ebca-2e5a-401a-5d8e-08dda30c7807 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: 1Pi4uHBz83qpY6eri/354sqtTfE7OsDwTaKtpTWq7JOIb2YmNDi8ReKh8cyGxlnHwhNiRF42yvmJS8rw7+BFdRnjS/VlDaaOmyd3lRbIraVbwEUX8D15DRbC8hcJfzcfRye27OMxq18+SCmm6vmzgqKrhkfGNZRlaCrevngacSW7LB9KhjfO4y5+NHbqHfI1ASrLL9Z11jkIGjNCPoyHakd6F4bD+yNWY+25fhaLaSkbQmamz/CnI06XNHf+oBMAC8mmU+ID1mzjzpnAqvgBmVzqdCfA/ZLBvCGaVT5yJ2gtPsWQt8+DjVTI/xB5hYqA4YiC8w8tt1GHTD4wqSz8GDs8gNlvw/liMAog8jJGIVG8Fgm2PlPwIbA2G95L/oLcqf1+Jfsr4INJKboG++i7IIgGugHIVdmnRMncQ5KKulu+V0DpnG/T3sa0ae0WFIU+z35sjDIgd8dgqptHCVRdRHrHYLP53y4DYMBV5M4oFY5/nc9W1Rav4KEeekV6mJmyEGfTM0VmqpZCf/eirrsvKNUjUGIk76z4V5CT/c/CU8hxpJhxivfQT8/p9szwJ4E/aDWCe5LPmLwqmoHUrj7dHQjVURRNq6qC8gx/rbKIrwoO/z6Vyv8pH5EmSNRjbC3QHgPSTejIbtiUmklqmsALnXRbaFIkCZW4uSKVbdsmsMoSKLMVBhbXmNWM4PlX+HANsFZsItxY5IbwQlOLepnkvtoZH8s/40WdOx45/ubHTNm2gRsYL9HU57b3Jm+jZrF7DivpkGV0dPdsEceMI/GOfsWXRlGb32Xf4914NxeQ3MRKyV+SqM8bgI94gHK337fdjzn/DPV7wOD3lJb0iMD833aG9hAsPhAhmAPNhur70MJFPkX/vJ2AQTtRDyZAEP8ldjqYzFUiyFE9w3+5L0vRFDnwswscYKBiDF1nJJ4/DqUXmq2gU6z4LxO57Ya2zxAGrRpBbP3e37B/cS+PdHj2+NOn5LQWA4fMLUupDyeBqPKIshnjLshcxweoR0Zduj2nibj1hW/Tqk177mnoJfJsz/36MXugw/fe8Q4pafRv684bfOQ4OYcQ2TKym84Leo3TsOea8XXw5s3dUjUUUvUXu8EW3loe1toS1hd2PpWbwhBQeUB2N3ObESr1EfvCkXb52n65JRrcWurulrRxS4kKA7ztj8Cz1RuLV5WeoTtVjSnaSoSYYBYFd4nroUUZ4G5s8Osa7N7W45zG3zzW+35OrXiF00XRrdOBczMDflhOZRLoLma+LT0V4v5mVRNyUoQvhXuQb2MQKu6d7YSCbYTWpHKVdn+y8LCZPtUhxcXwfrycYnb6S0AjD9fbiat/P2elvF82M1tj5ynlCye6anZZvPNBHZJdHLAJopzjIUN7ukUVu8rBCNcJ0XffWBVlnBSqOdIxakgRzib1jp7cnjdwksqL7jBYgRCweiF0uRM7b2KOgIHGzt5t+Eo8NEyBZE4RLtOPl4/r7cVelxRgGh2ehwIhxEuhbEzon7N+AaOXAhc= 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)(366016)(1800799024)(52116014)(376014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7QDQ6NBJo1ycQk3XinyHXhPN+yWjjBTR4zcMZ5u9Sz/Wc/0HovDP2cNHeVaApdIljb5nu58YNwx81vSYJoWUU6WYTcdXDf/bmcd2dE+ojVSfxTAiO6y6qU0oM4tLv9rcSNn55Y0aprBmbs6tryMi9oVUtoJdyMCqLggQlShPQPS2NbUFIYi3h22dqwr/vQdOuX7cShByJkRaGAn5YJmzr6+15cDtkdjoQ+V6QxPKRR1k63tjiLddyILzv8qf+IEEQspzkHXOuSZ1CYV8Ia89ezXhpbT1spsHkZT/ioNPs7UPC4vzPn5h7kRSv5EZmM1roC1nSuuihiujDruzWQG7uwHSSkCbApEzI/VAxNN+/sN9hoYEvX1V84kr8gOWPzOlfKAlRAXi3SuAgAuzAiHFosiOkO4R+6ImTDEHjPboM89CEMcrnNEc0VdcV4Qg9bys0cS0Ns7h6zCSf9A2Dep9WUL3KYmvguTMQJDtnwz8I99MnK+Zpx1G27Mv1PAaVxdtu3kQJSD9qg8MZ2meNOOTxa8eowbURwtlzYTycycLTuzxnpWKXipQAcbjz1FZ/Spf2KRAtUS0MCWjrxJjHrqXS9fIzPPMtbKzY6rNRdxa1IrR8UmPxRNCGSAO4e6mMTKJzg5j09U+iOZDYQmHV+QwmSNneH8VFGP50rl6m/t5HDXUNPApgPJ6oBM0Jtg1MnsdzA3X8hiRymO2PkVORTHaeyQNITSk3F8TWhQggNgpRwEHAKibh/6nAzn4KS+tU+plSG5Bvd6SVbubMoDHkJfSqR/vYr1Leb9IAu3cyRMWlsdFX0miQCyCt76MErANnWXpMT45VFTNyUcONB7cz5jnqnnoPT5o/urDMVxYB98rEAuRZI0/+zb8l5T4Y/HEJ3NnE6DsDfz3aB6iiOAIQZgpiPABgvWRi6+r4qxmRGf7FFMbju+l0uxn4h5TneNMivMSPG0SE6V1i0drUECuHsMNlVh9N7uCo/pH95HfKHaMSHjeCaASBZEmHJvzpB0YAqo9e5T8T+VXGl1fHrKzlQduaL8+lCabdSL++BGsC6sY+fJVucy34kjqZXUA8nsuxvlYi01j3Gc2tgPo4sbmqTG92AeTuq22JQG/DqaRNE5BlK2pLrzW/LcEni7aYEFYuFErFVtErJgD6Y+tVcfxb2UzFDYEtRQz4PmaSRuoGy+wG2/q1Ldd3uo9deuH6CK0fu7QrpceotVaYy6wesImYgvsbMEAVkA4zBbzarw3AvLChT1BthnE2jeXB48BoAsU0lUysNwt/yuqethM8IOKHoeQjMqxUO3Ab4oG5saW8sBGHiX5RGUxfBxxCifdjSRmIEVDLuRDCkANv9uNO4RBL3Bf7AqgIQ2vlKSQtUEtGsQQbfJptsW9c0C8UwVb674ZvNg1dSrA5n1QX4G8ao50F5auqk54XjpBJzOqsPDcdNrXBRjhvAKQXSOtddHQfHXD6zrDjJz6ON8lTeyTOcTVhhXhk50SrxErMf5aiwLNyd52o00UHiS+D3iBXTTxGcqd8M5vKjDWcIyiFXppwR38DaIP0cI94oD8Mr/GxzaeO47wBOwxOJ6ndLVVGG1sqaTiJZfA6A7APrQlB1W3HXLB/upnNvxnWqU2P958f9KqztsWIK8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3804ebca-2e5a-401a-5d8e-08dda30c7807 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2025 02:06:50.6587 (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: gK6ITLIzXXo/etEnSbmgKqfVBmB7OrgNkqyrCre2IOOUMmaCV/4BunPiHC5E6SCFK7+BKDcEWufI+avF71p/4V2s3Exc40Ei4mGiQBhxSS9IwQuW5wi6AL6oukB3fxXb X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYVPR01MB11277 From: Srinivas Kandagatla 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); ... ^^^^^^^^^^^^^ } ... } Unfortunately, current code is broken to start with. There are many regmaps that the driver cares about, however its only managing one (either dp or i2s) in component suspend/resume path. I2S regmap is mandatory however other regmaps are setup based on flags like "hdmi_port_enable" and "codec_dma_enable". Correct thing for suspend/resume path to handle is by checking these flags, instead of using component->id. Signed-off-by: Srinivas Kandagatla Suggested-by: Kuninori Morimoto Signed-off-by: Kuninori Morimoto --- sound/soc/qcom/lpass-platform.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c index 9946f12254b3..b456e096f138 100644 --- a/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c @@ -202,7 +202,6 @@ 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; data = kzalloc(sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; @@ -1190,13 +1189,14 @@ 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; - if (dai_id == LPASS_DP_RX) + if (drvdata->hdmi_port_enable) { map = drvdata->hdmiif_map; - else - map = drvdata->lpaif_map; + regcache_cache_only(map, true); + regcache_mark_dirty(map); + } + map = drvdata->lpaif_map; regcache_cache_only(map, true); regcache_mark_dirty(map); @@ -1207,14 +1207,19 @@ 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; + int ret; - if (dai_id == LPASS_DP_RX) + if (drvdata->hdmi_port_enable) { map = drvdata->hdmiif_map; - else - map = drvdata->lpaif_map; + regcache_cache_only(map, false); + ret = regcache_sync(map); + if (ret) + return ret; + } + map = drvdata->lpaif_map; regcache_cache_only(map, false); + return regcache_sync(map); } @@ -1224,7 +1229,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 + From patchwork Wed Jun 4 02:06:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 894277 Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazon11011008.outbound.protection.outlook.com [52.101.125.8]) (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 2E8901862A; Wed, 4 Jun 2025 02:07:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.125.8 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749002822; cv=fail; b=dV1wVaBKLqCjjJ9r0lIcUqQzda2Zr28d68qVdb5lSiXH0uAjZtF10rtyeHHqIqe86gbIbmuiPE80YnKSX+q0N+h3hriEzHjYE37yqzseK2/7LIApIxSZo1/+oFbYRhr1AlGJYbk1apX37nNOxkUVCXcaTiN42M/hhSG0GwYOf4Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749002822; c=relaxed/simple; bh=jynUJB63Farrgfypiwb8lWVFP+cBiiNPtwfyMEsknBQ=; h=Message-ID:From:Subject:To:In-Reply-To:References:Content-Type: Date:MIME-Version; b=ohH15svke3lP0AP3pT/GFWAm8lPscfHkb1sfiHx8Y6InuqAZbG5HyCAiTVphGDHc+VA4WNXwpgxNVqoCpaWju7UZxiWxE8woelYcGHC9DxtszA7tkO1+hWpR8UysCyPRRJPinUR7EAb8JEAaZjFy4sLSwavvz3h5YwKnRheQfbE= 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=YYOqD1gO; arc=fail smtp.client-ip=52.101.125.8 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="YYOqD1gO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kZ5Du6kUr0U5T+76WjagkwM7J3uDlkRoyzHrBG6DzjJSifCXCwgoU/2nP/J8UKfdP4mpIDdaGMEO+UiDvCu7MJKw+ebTGavjgbXFgktumpqeHO/19zXtzFMBLKemzHhdKHJei709/0gLOF4L6vH59l8mGFbAZ972x8rWUluGXPbeyR6v9vcvORGrf+oS3ZTHCQ0R5Xg/ya5xEochxwBYbA5Yj/ntnWFJj9A6etvaSFJhouuPXWiclqutEfNrfNv7Br5buwczpcXR+YSpWcZBmk4lTL9StHHXPF3gn76NJlxDlE6scfaOlRF7Zyn0ybCP2921vKDVFeaGk1ogJkhPlg== 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=TmZw9KPaZVIoLLiJQL1xuQawHcvvCLg2afQ7D9bPec4=; b=k565N9R97AsyvqJRFokfde0HfWazfYp/s98X5IaWARdzp2qXyHFXzHZQx9/4DvjWkKuzE0UV3UhHPxuEYCwsy8iV0t+uupy0wDkZcbe5BW6lmWLIMOUl9qBSoQdGtwpwiDwwb+wMv0qXVdXpVK24X2DPi3Fd20wl/WDmXid6VoyWOji+uomt+wElxj75IUjSHattIhLGl1yHaq6dbQN2VYoLauD5p2CNDkcwqaWjh1X8s/c8qa6RmEF5IpVU3TloQMuR6QbNfknrNe01RRDeIlsGzlLYkza2eVOFv9o4rO9i0hgmbre9t/HSfiTo9ANt99cUrUYLZeDcDxIB3ZuIEg== 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=TmZw9KPaZVIoLLiJQL1xuQawHcvvCLg2afQ7D9bPec4=; b=YYOqD1gOvjZLkTN6sQkzQe9pZuCJCjCS4Tp+b9jxAfV1Og1HT+ky8bO1uyF3KUDe+alrYJtwLjxtpzhwErklP3fjiomULcG71IhPAFlmsm7ZcliNprUdjZny871BGZ1CxpDe6BDW1vCeoWF3n4qltK1ukw3bzeRT7XHdKma741Y= 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 TYVPR01MB11277.jpnprd01.prod.outlook.com (2603:1096:400:36c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8813.20; Wed, 4 Jun 2025 02:06:58 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%6]) with mapi id 15.20.8813.018; Wed, 4 Jun 2025 02:06:58 +0000 Message-ID: <878qm8uunz.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v4 2/3] ASoC: soc-core: save ID if param was set in fmt_single_name() User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Srinivas Kandagatla , Takashi Iwai , linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87bjr4uup4.wl-kuninori.morimoto.gx@renesas.com> References: <87bjr4uup4.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 4 Jun 2025 02:06:57 +0000 X-ClientProxiedBy: SL2PR03CA0016.apcprd03.prod.outlook.com (2603:1096:100:55::28) 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_|TYVPR01MB11277:EE_ X-MS-Office365-Filtering-Correlation-Id: 5369a8b4-89cf-47ff-46eb-08dda30c7cc1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: EI7X32V/yFU2mLuV1WutC3dRm+VJ0HJirfQwlxwSAH5CegSPi15AokxoOWqYBvnosjtb52sCBwrIlZSZzTNspBKxZ2PP+rpwKsIAY6p8/WDxeoZOxPqrGj6t8+oTQh6p/ukz4LIwAQLWbdezDjWvZ2M0tSw+2wf0Igns0xhWL8QHcdvHXVsxJlnu1rrCJSnmmHmJTpa36VMO7ILzCC9eBm7RL0fgKdmXIT6UeGPhlhNHCFlo7YSSJnSoqBsvvp0/LyU9gCw4T91ayB1uwKFYaPsxWT/LlOYfDrs8YL8IRfeJkFOYMLkkQmSDEpLfqXrQC6d2sMglAOAux1c8nCJe9CVbe7bzttO4FGDBvbesOHqMYKVZcvzbAHreKZSpCkcBPVvBDWCXsY4d1MkRN0MCwM8iKg7y5BTkc4GLiL6mojBg35xB+XWAPj6qBRHjPSjmUoyq+yb+0RZ5sbT7Ha0i2hPa1KEiP7x4XExtdL7/7rw4KggdkgNXhhqFi5ukfFlBr00vNHMTF2ZO7HFKIE18FnfkxPqep3dJD+b0uKynWBSKIaXHk4khKgD9jgcRnHhhhjvyW/LSw+jAv7sijqominO3SNEDQozY6WyYYIA6X5V3pLw7XfK2oFWmCD/3tTbSOWezNQ/t6vxK7Ur4bHE0mbw3Qs+f9zhvOrpMFFU818m5Qxx5bwFElhiVMkpmHUdTTftyNCtKZse9ETO49ViPwTSQdUq14qw5pkcTnCPJzxla3AuKp6KwQ6lWd0vxgb2/NRdUspeYxG5JqYt7+/KMyaPuun7Fj8L9kC7SVNXdTxOJ/i3b8QGVo3nxFusWyBChOCRUNPzf+FiHutydNnR1EcZIu8ywjL3SecRRdRD8XsHKe9+0yl/4Nh9c03WUnuP21BjRI7YFM1Z/zgRmWPUkHM227BiKlkXD25rbwmBDSDF8uhw7XLJRxud54XYlaY+ZtQWFN4KpWx4Qxc8mspBbnIKzEoGQ+QzwCLTsTC1sZz09KA9gL34goGorS0fBYFda0NrSXqEHbYnW63J45XkK8kCHnG0Q9Ghmp0i8fw1jYJ9os2e496f8Cy9NQ6I+cSquydxxNB9YcfrEQEaViUvgSnbO/AQYZMTcOn5mHh+FQrKolxn5Jmv/8FqMt/YNBAMlxzkjh30nPxYB1WlJYTnEoUJ9JBHR2h5vZ2WRw5Me07ZEvBbgrVrFd/A3vm2PH1IfDvZwrfkeoKNxqCztJ2+dfN0No0i2pgRigEM6fXnD2ezHliwA5A2CoCodG5sNmqYax+XSluLOwnpjKf6dHSlfHUz5kXp+VUYjShYS7RI3+02WjpbVgtN9TdQr7Qt7thBmr1en6lT0fHoUZ3jscTf+Wx3e90qsBwwn2JmzQmerg3VQ8Ifj6cKkxbSU7jp8DEUAwX3owUVbdHsNMRCYFYR34OB8b3i5uM4Tgzxj3vsaXlDjwKdTLWhwsltpuHWw2ldNBRTF8xc74R7UYDFLwT8pIw== 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)(366016)(1800799024)(52116014)(376014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i4t/Bh2Tsszudc3Tc+A+rVxYlbDw6Wfz5jSg8rK5oiT+iHNnhoYnp2Y/VIL9jgEUB2Ev/vgGUnhMHG0t6FPouTYsqThjT15iKPo9AULNfRe7QHGKf8ypzeY7iTwlpxrGkSOJZWbz7qpa10qrWD2DmZdj2Q8zpy6y3lnisBt2xdbF4Zm2l4iuxfqnWAySzSJ42v9HSzsiOY41rF8B1vdwsirOQEbZgXW9URJwvMquLOxRsj66rB3uliyq+vu5FgJOLU+aljEiIjn3bOCVeQ/9g0fOdSxUXkzhJZBhS5cvzH2mUC9xN0XllfbZGlAqJwCBNFaCnguaurwUzbOiDNioNTkIDRDgtXfn1vFjYIBXdaUH0aJMrNhK2EqXuWSV8/QiNJvO2w2kOi+r5TbW2yKHbI1Fjp8je3tbJAugBDI/ax4Fzt2EPNuQQLMaQH3dB5IoGagAddujR5zX0zmNdjfeRpTeBrKYF5anV2yGfKqCqnNPJ8MTZeoNHs/akS9E05pm93yinafooigt1gvmaZ5FSLd0NnZ/Neb29mvOLCZ6YkS0vlUvHPAMEvoBUYFIWCZXCFQ0qflRqkJesYUz9hRqG/IQBBE+Tl07/EafzKCW7Q/8iT93jJ4KrfLZtcndmUfifhb4cvJnNgVIWNehjDGiXGhv31Eh4bfXxgVLUCNxxBLVYlB4hZmZvkUS+4Q6hIeC+GV5ALSQtlhxa41Z0RmiivccGU3NOPnr8BR3zw4zZk5k2ncHObmCk/wBrkpB3iNqJmx3pONVjXGxfRcDTG5PpEf2KFoIsDWhP0kwtu+seFu2l9OrwlCm8sGRdz48wMbMFcgRlqgVM628+C7a+lG+wLQ+uN5H8alAx1Tmgf65rsFBaMq8NybTOUqtr+3lWcOGPW735fTXTrsp2B0tZFRPNvLUjY73U2pS7DRqvAitSqTzDTdiRC5+RLvsI2rn7pTP/Kk8Y2cTq0TvJqE75oDWKao02U1h832nFsmo5oDdMqi/UQ/+ppFHF2SdlurpnycwfHuP+zYlXuSoFV6oSwKx/+egEm54G6AZ2uS/r1AAezdQjg3xGcn3mVZwEVmGqSBKOzLPMj52Sg42XdoQKHZYBpv9IoFcRTEp0AhM9t5bEn5tc0pJpb4nn02GvX8sY0Q9LRh2H7aSGv4RaosSU1uHk7yddpacxyGoRrOhOKU9wnXpKpC4F8i8BRlWY2zUWRW2idUZcbIMF1gH3T3Rvj9Bv8y5o53aPFxKlMTyqGszDaHWHkwWvCrk50yGU60UMxG9Y6QBoq9hu0D+WIfCMAcSgF7ze6QnqRTm8PjdLCrQGrNjcDGVXUnFiYWhPxH0o6ueOlmqIk/t0cRiEJyz87hQjFdbeFIkJ0RzEbEICSuf2STNE1xY63u4LHnCGpLe3kZuN8YZaPyJ2ZsG8k/uBk9z/B/h5MjCZMUzOtTwifqfl6ST+gbFTffhOm4+ij7Zv/gGONCyMAoikUmtrzygk5RIALdevaKsMBa4HDrsxseovvcehNXhd5E4vicqsdc3LDv/B2zNVllCXZTt181BTs8JXJqK4ShPGeRSD6aUoOPAWOrcOmTTUMoppJzSS8EXGvnefYBGWIud1CJnuVp0IR/oV0pP1hOwXv7+HKjE+wPsB2A= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5369a8b4-89cf-47ff-46eb-08dda30c7cc1 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2025 02:06:58.5635 (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: dL4Sqppc6DVtzgaYs7b4Op38sLPIeny45+mAOtYuoJSxcWzc4ZBddDk1vi0YGalenc+XuCPSsSMRQzCc5e2kiZa87GePsAAWwOzo0QhJg5FzB1vkFgnzEArHvTv4bAGL X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYVPR01MB11277 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 67bebc339148..ecea2dddbe9a 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 Wed Jun 4 02:07:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 894043 Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazon11011042.outbound.protection.outlook.com [52.101.125.42]) (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 6ECFBE555; Wed, 4 Jun 2025 02:07:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.125.42 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749002846; cv=fail; b=dU42FZL+Wuu03DhZy0GvJvjE+v7yuFW+TT7EEiGKn/aEQehzz9eSlj3jYGaio3pP4L67MxJD8BTa8oAEAQMZZ94xnYQ6XOUVnJuMD2tpyG9nKZflJXo1EDYkZFbYVe1lshPJNs6ymar/Zc1gK6w9rzP/HbqvRBPHProyqV0LbRY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749002846; c=relaxed/simple; bh=wx569pLFve9GKtw3ABS4VVPexyUKNsR1EYviNNQ1kuw=; h=Message-ID:From:Subject:To:In-Reply-To:References:Content-Type: Date:MIME-Version; b=AKfRuBNC/rS+7iubYMpHEyVY3/t2FOcql9JHoIA4d1KD5KH3RmcjUE9l+eHw0oEWBZDWtHDISOcFlvLFJgamUi4MHDt4HWXuuK/LKoeG6mHh7rBLEkJ7TwR614WsHjOAmR38F2e+DscIPV6SnRYxFhgxoennkzxTsNOQ73HqXJQ= 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=nizVz9qK; arc=fail smtp.client-ip=52.101.125.42 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="nizVz9qK" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LSX1O4ZYuhhIKpaTqvGSQAOGPPCFV1rqbEuAKsc2ugu/aNcO2STjqCcna3q6eP+fOU44s5ONv3wct4FthVXffDZaSgHiKcJ1YUh/1aeTHzrTypQB2PEN9Rndazu43W289ipjwLJ8Y6IBO6jVA0WeYyyWI7L+3+0fNXWy+Gn4BDIBdR3esQx97al0uzzDahhLb/SVpvA/XQ8CTIVrZWwcmry/dTFKa/k/CWbYaqw8lfU1XvEd3dM08mgFmp5ezTNPdzmN6mIuSfHPh4SJ6CxbZp8ixrKJn6vPocaJjMNcsa52LbwC1NmkHrRYEBhYZo+0wBjJOJkyqQaY1o9Qpl4TuA== 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=1fMJFROy8CVQBr6OwiQuB9HGFvtwGkzvIqvQliYvV7c=; b=e6aG8LdsdB7ZqokceI6pDh/SC+e6lxpmnM0GFlC848wluiOc4niJ3MA1TXFHlc7/MtQMvISrKlb0htrylp6xFdUGGvAvGi5XwpnEJcBgpyD23wjhaKQZlU4fKaI7NI28sbvgK3n0lHqL+buyivjPstRGtbPtXDhhDiGRjIudVQa+Lk0c92IWbt9bARk0ccn76Z29mJNVVVyeOkXcdKhKPUbqXB2DXwJJdXEfAL+VElWDHvnXNTXgcJ+JnubcIFTHIqG7YLLJ5x2+gAhI474sXH03vNTDa0lyPFUPzKsba7zThhquFs2rkwDNUye8BtC/IOuIIaGokQo86wzXL/i77g== 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=1fMJFROy8CVQBr6OwiQuB9HGFvtwGkzvIqvQliYvV7c=; b=nizVz9qKap4CxLKHHWfIMMVBt+0PbXIlW9EZDpQam/WpN/IkCZ+FqKudB9UFpXf0guSTyzctEjL4FeP5HTYNSidvgRxzDDb4KSYCjBez79Wzl5ujae3233dot7/KT8wNcQMaOEJQaGDzwKsQYb3mzSSNNxhPKODP1WPZlAbDS84= 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 TYVPR01MB11277.jpnprd01.prod.outlook.com (2603:1096:400:36c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8813.20; Wed, 4 Jun 2025 02:07:22 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%6]) with mapi id 15.20.8813.018; Wed, 4 Jun 2025 02:07:22 +0000 Message-ID: <877c1suuna.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v4 3/3] ASoC: remove component->id User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Jaroslav Kysela , Liam Girdwood , Mark Brown , Srinivas Kandagatla , Takashi Iwai , linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <87bjr4uup4.wl-kuninori.morimoto.gx@renesas.com> References: <87bjr4uup4.wl-kuninori.morimoto.gx@renesas.com> Date: Wed, 4 Jun 2025 02:07:22 +0000 X-ClientProxiedBy: TY4P301CA0009.JPNP301.PROD.OUTLOOK.COM (2603:1096:405:26f::16) 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_|TYVPR01MB11277:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ae5e344-7c31-45d7-f3c9-08dda30c8af3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: JZpoy4gTz3DKER2rvHOTVaC5sKdRw2xR65igS0IebzC8JeXXYEk+LmPiZtMOSqdGuh67O2Y88iQXEpk9JnkKk6oyaa6YL/eCF7sGMpNaJ+GlkMOeNTQUKXgzTWoKHL2JG4UNU6qHevaYJPag85CMLMVGUga2NTJi5Mild7gOla3K3KBY+jfnxJTWgOEFUYbgiJKN/aTBQU9g8QT4YwtZbwQ1v82po/pjouucetRMYNcKAXjX38wzqbAnOiaUcOom2n1Uu6yQ4phmvbUEPkvXa6v9wzqUM8TmSR8W8VPOAnLPmdAFWx5q9thuILjA5uRn6htWLW5Y4htDIpsfLwi3bIdfMaOl1Wx+sQA9qsPnWw6K8H5Ea00ZKV5dZaQaczDDC+VQhJlnqPPrzEYcQD4sQqpCRL/0jeYD3AoAmIh7IMqqRVdU/nVXY+CX+qgv8xA+dJ7fyuKgyqmeQMH5Lth9HgxGmquLWyxqwO+AGgVOlRl7M+DBozCjT+Es62R1TcIDUaD+VqTgYLL4KpmSmYYFazDZPl2CJLLvwhH3EqpdkBGkrR5zFLkKq/F2SLVTYi3ET2fUJxIUEpm6CbAAdQ2owL/ACrAEtb5CHjh8Ro/jQ2tv7/iwDvXQXOapZTpwSripdyzPlZar7oJjpelzz7OfaSTQIfKywXThWcs3x+vJomTPzxsMSnD00ttr9biBB4zJZ5umqTN7RsGO/cHINwt758nllxxAO8n8RKOUZvcQoXIAUsUyfWowSLSWgMHBo47KX8XYdEa1lFWly7K7S1oJ/Dgwnmkmj60DbhpVPfNeB6T5EnaLeEEW6C2IBzdq/fJ3c+eRKJpOaCXxk5E8dKuDJlQDhgLThI4/lpDuOVjzeGvT+Xq5gGuc4Ti/Zn3dml2OWGTKC4UUuxKZ9i3uwB+V1EC5rB+NbRzG6ou9NeSlwarr65WqfyPGQLFWfhVdh5/3tlk/U1Dky65KQTpLe2Til/gzJJIgF+QyUA94mdoc0oyZAPiASxL40knEfBWoxIihCxVo5+iiy8ICVYDLrAfITihiHEFxoUa3o27TsUiN3JC7e9csihasEoN1hmuce0TUrwwDsJAYXqOlb+drzfIeSEenV21oCOcaxmdAdKLts0eTby5CGH2+3RTWlPQBi/NWX5kyYIVIUXNMJ1x42IJR3JFowIEhO2yGa1efLTi0S2caBVykdX/fUmVJ0ciELpYHyazKRtGvXv3lyVHh1QOaYxfCRwRRpQlDB9wpB6M4rg/V1tpmgdbMuH1R/Vp2eWUC8RST8XMrg+Mm0xyGxbfURPnjrrfptW0f1qkulm+6kruMqaY0OGmolBbzUo988AYCGyEPHcJkqiknxToJYDDUJ9zRwAzYsSAqyp8YeTTb9S8RjoHdz3gPwmqSUi22FX0sUJrWPRJQ5wo8l2s6rFjFeD/mcwuX19PuwpxiC7zBWDtv1rT/CJOKIcuMVlj2ae7EHheMX1ojFWrtZvXw3Zd28Q== 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)(366016)(1800799024)(52116014)(376014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tzxF6Whx6pIMRoBIQY8lsPR6uHwouA29MgHc6yl0Qj0Rq4KcjUPzqJIxxeZqImOX3xfA4ZfkGyo0rB7zTAUpsaYn1aIxTvzTeECbl6hkDEZVgFz7bCXxbX8comLb/zeELC8DeTRCt1ffaPX4WJKxmUJ8HasNaayGszRomGrWigy3JG/l0IEibQXmgF+//DnYdDJgb20iQNS5imvgxFLM4vYa5Fqw2eZOz8Z0UDBaBCbdPgvwjEMBMemF4rWModqFrP2qzXefe1NHfxKYXNVIsmAVdho9bG0CmHJpf2ypo0ZCvyKH8RU0lvPINklTuUC/O1spEvf7nrIYABa0dvVvkbARYEvrG6wZkRM2gEipJRAYDyoYNYuNtif0JLWsokneCl87ihjrAA4KgmlJb+v0ZXdzP8k+EhCFFXMNJJPj65U9Zo6o80ltqq7g/PkzDCoGw7hNZ9e4cUDXrYLT29ArdTwG1t/KVYxWFb7owzO1SWaywd55aM711PLlvELYOeRWxBAainfWdRA2/42HdY4R9k4PpDX1mNtIg1ZiENA+VLmBX8Y366uBWe9Q/AttejwkAfYmg1GaqLFuujAnhonIbQCGTgb3OAnLCP/8EJXREo2wDf6gAiaH8nDd6HwvUdFZEwKqxsMKEEc9D2cc+DByHoU4jjv2MXa48+Uujh0KVYKyC86KXHS9BcSybOvychaihk6GGI4adRnqyA9rwSabQgsSQDoiw+5PR6Rr5VOvMuZrxvrXkvJQ8Q/KofJaAhm0gle5rxqIGcQYiVbJnT4buMLg9zQBXX9nahPTAsmgdcxCHbPP2sXAJyvrlN7LAZCQricZtp9F4b+TRYNT38Tk3oD0JBdKJsbK4h6yzuv/zQW9TNp5jAeG9rm7qdHPU1qG+fCKMa/45T5Z5j0YmgPaTxnKJslrI+GCpJIqj6Vlleq/j+RkXORGNPrJbaZZ0UH8eT7hfCG4f6ikTSRkjPO1Rg4+fKKyCQXgLG/Ql8wofGpbdaXZjsuysWiUSsZJHo7PslFTYTfnr6EUbB5AtdY1N0JoYH/M9XVXWRLsCMesxhvaGi95u2eVJLm9+mqjekGQHRP2M4lBALhYzvPHHLwZWVu5iH7rECt6tBdQdATRaeljap7QMP5lUQ40BPJZ1vf38R4RxIWY11FqWrIRs6bBacrdy6NiPKqKoxTCvdscGo5jbfRTGxJ+4HxopRoW/vIzqLagL0/WH0BwvyNGt0AtZljszKEGORRXBxOlyE8PtmNZm5ZyEMpD0R8nkJKSCtgtp5eeF4ZCp4OvHEY7mvjwsv+Rk0HDrGXIdYVw71YR8RLEvn+/ZrpF4Efhhu9TiQyJUAItEqrfw6zUYNIWrLiRhe9+q/D7s7MDtfcIGtRhNM20xieaRnqXMzRnhRZ2NvOjBL8bpP6SImWb5H0qTuBTv6MmSCi6uoYs6OV90Y8w5BDvuWC+KqVfWEaOzAUG7WKy7PyejekhN4naPESoV8F6BfdqyLCmW+a4H5vkEmBd6qC672CugTP72Mned9YYhouGDtXqkBd0cup/kqHF6kg0xT7qtTuZOFSsa/hRiaBXlxDTfgriKsw4Nfz0Qvz1LtJE1JZhjvasxIt0h9Ngjq624qpX6jVm+L33SL9xnoxB5OU= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ae5e344-7c31-45d7-f3c9-08dda30c8af3 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jun 2025 02:07:22.3980 (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: Q4Nssfzz/Ic94RJ453LEr5bw4ISpIneFpmEmpoL0r649/1Z2Eo/l8POxSaP7kM419yBccnSYZViFu/tpd/bfjoaP3s4n9lLn966fPVM//EsGNd1K9ZT1PfTXP3wWI3c+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYVPR01MB11277 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 ecea2dddbe9a..cfafdabcdc88 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;