From patchwork Mon May 12 01:43:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 889446 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010053.outbound.protection.outlook.com [52.101.228.53]) (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 7BCD51AAA2C; Mon, 12 May 2025 01:43:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747014205; cv=fail; b=PYw++cJtM8Ewb8Ug5c3oLqXK+BuJHA1hcntLbDFqA5KexulBLgM6PGY6yGv1kKG6hN6Rjx3lkLU5U3frTSqJzMptf8KJqMO56uHBS9Mw74cSocEIvE3Oy3+us95pJbUEc2dAawFgcHu1tDeSkAV/CbC39TeoBbHhXGMhuYbI8Dg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747014205; c=relaxed/simple; bh=G5NkigIiAJsmcR6uKMZUxJuqkERpAYkfE8HvbouCzuQ=; h=Message-ID:From:Subject:To:In-Reply-To:References:Content-Type: Date:MIME-Version; b=WqqxLVN8nCkqPUEEpBUBtxH5qlqdGV9QriT44mGQx6DxI+UqTCk6ODKtbycMXh/gw2XzyEH3LcBsJr15lBqOF+QMH7YO9KTNR7KQWsiih3UmMzxNFv1vHJWdp/pOB6yMMcpKtTQGAlx1kgQ7YilF25I4USwCLj/ebM3DFYS67/A= 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=WUERbsHI; arc=fail smtp.client-ip=52.101.228.53 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="WUERbsHI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tymDWNAZJyub+fnKaC+6rf0FjIGHkraNSWyvM34uRq2Wk54IGAJFJfz1bcrLWRTviUF7figEwcqK42VJ22x5TqTH1Lyk2QuH5lUikgCfAxNRI/Ow+BIe0P+FHpKNE5cQvwpQmDMejqNYDGeRqQ3tUVRa/VkH2pLly73uycDfLWf1Vxhuuqlu29OE9CWqVG5syM87D48ihQvOD9tYaq0biBAa7NP9Ra6nPqvQ+peYUsDmXDIhFwd5lUez3Rq4sITwZcrGa10/bV1rL6m9zHih1EgdxPv9Fft/HHtl/OKc18pYE4YtrOP9pMuPTrAMoKcdjcanNXuiQIuAJQ3jq6cizA== 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=P2A+3f6brrXENM1pzIHMnPOfauHrEdoEumgecM4pJ0A=; b=svfRwIVp2civYzXen0xhhXId7RZq7GC1llPmBxfAVkxxF0u7MVAdmkiMJFW2gTAEKbgZos/Zp3g0XSMy+4zNNy9FuR3KNr4MraQCCczOSJLUIs7BMar/xdvNJ7vZyxGJLsLrHoioyaUq/qOW8fUaBnk1q28bjHYxLFupAPIxFCYhHO0LyzIGJnQZCA4r71VJgJqshgjcfWV6u4fNo3O2zEoyHf1obMBLGloTX/nuTeIkQxXyS5DpShfQYbndbun0jSU/8ZFzfNenxvkj+HqnH6BKrDAdv2+V92sW/980Ledm63FFJYCRIxZSlB/SANrHIWBOKoywN+X4mqsddGml7w== 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=P2A+3f6brrXENM1pzIHMnPOfauHrEdoEumgecM4pJ0A=; b=WUERbsHIMd/WMpcUumfHlO96OEjYA3HhG8ZR16g/a4s/+959svmAhdBRIfrqGJbQrEF4K1y10vtDBTfV3nQ89SPhP3x88//biEBcMKPC1o6t9FATI1HSDBttU/tPB8z4p2vP5wUhIJlDR1IlQHNAz/EUskmFlNZBbP5ueFpVZX0= 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 OS3PR01MB6824.jpnprd01.prod.outlook.com (2603:1096:604:117::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.29; Mon, 12 May 2025 01:43:21 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8722.027; Mon, 12 May 2025 01:43:21 +0000 Message-ID: <87plgey56v.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87r00uy57x.wl-kuninori.morimoto.gx@renesas.com> References: <87r00uy57x.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 12 May 2025 01:43:21 +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_|OS3PR01MB6824:EE_ X-MS-Office365-Filtering-Correlation-Id: 77497bd4-7221-47a0-954d-08dd90f6606e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: SyaeYwsU8JhSQATKi0FDqvEnVLV7SeL0P1UEsGi4/C2A+CoAywmV/6ZTz/DP1YlmtcwsEHaWYpxvCKFIeEKFQ2ir1neys3TsuAP43iJZLkUvFcstZ2JiBl5vegQ1E8PVzqkTpFiBCM6ThxMNyTzMLErEkIIXWaDzB5EwJHd6Iy1aCZ506J+mAnRD0JZAobcZivLWMF7sFqYEI+cDtkG76vfk0iWjJ2nD1Az2KlQnIcLc36v1ogkp5ijXqZpR5HT5yNFS+qm/nyAED4GEFOooJ636vnLd4bdyNEenQ99rFi62Q3gXjhgAJGLTC/hRB3X0BiGxAyFhINn+lOsDFqzPEbjuPSEVhpVw0/faPHjKR9C/rFl74yBgN28j3Q40530VeJpc5c/aINIPndIC+sJJ64Z2iIdO4/yYA3F4cICJfjkegjC+apdSO7q0zOxJRnVf4WjqjuaVFOvrZCzjP1b+An1OXRuuB54k1OjjVjHbISH2lSwC+0n4653GXPKL7NddUU5eaDXaVJAisOIO2FH5Z5CNWJq9ptj28w+/qsbp364StshpziI3Fx4z/TDfUqwTF7HNx9mnQubdNR1HxT7OzPOsUwmsyYMY3vb9ypHprcoCjMZDJzbjRTyUXluuNzIG6+mYnkLIGC+W45TcuPD3JRgzamzMubXSQYGzj43TL1mvfSP3YHvcbjPZ0eQVowluLhpc06XlT7RvUScRnNHnxB84o/Hzv87zethaFfNIg9L/BN6Su6u76LeayYKh/VDx5MORRF7Kw0qEA56zoyiKENhDX3fvFeiAB7FrQrDSlE5zsXQRgJ94gikEu87K4iRbI+47ZO1bsNbeJznU4JV/Lb10bSPOd3UJoN2ZOK+BW5YdaAo6KM4mB6gdF1RXQZ0CtRoJhexXE+36tRBwgPnU4oazxWRngLIvuXns6NAoJYMJX5N9vVhVcBIEz7HmsnCDnreBvjPUhUeH+XcAErAdaSvPhDPXQDI7xXPyJ+njT7P0LM3KvKhvXy1szoTu3pFwW5giBCDdE/jJ/q73KAaDihlyMSvcFZyHxF3Ol2GSeUvrqHbe/7uVGILDOki0e845ogHP1QVZQSd5BBKXtiYOGkR2C7kKYXLe0Uvr1lARWHFuMmpf71ZcuK+iqYxqZ+Dfky4lGxcdbyVasOaYFHtEXzubNrHLFp7+N3aSsvPfX+6MV62fc1okruahicD0DZUKncguTjD/umIRp/ELCv3OuSZApwj38kd/MC3Qh511WzdXG2fbHWwt+OZ/VOoGlreAOar0TJoBIonKzjZqWefi8196OEkpzb3qOaQCGU6WJUR0dwf4Dkeut+B4lKyWo0mr8d5Q/iF5tP37PTurR6asy5q3CNWGPwHK5pkCUk76BZTt5RHLaGpnf9SKXgheoR2F2O1PmPkxuU0IJYNZ7c5k36XPsWvX0TszUVwOMg3qDbai5nhvRXLNQEYTPs1tDP8mJ0UCfagdZL6qSTEOyx3otQ== 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)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K439LjN19A31qsaSs18ZsIrWgLLFx5F6waS1wOGhGF/sOz/hmdUlRzzSvBbIbdTsQPVkgEBb33IBoAV1pnTJiL09JPxAjoBdLKvusvJikPlKA1zYft5V5EnENKXRxfsdqyMXmAom0LPB32SL/tEidjEtL7HUoqMEbzd4iNtW9gHAYQ830TFijeXN7nhJLzYuuJoKIWrqQqAoPGvSQHltNJBFGgU8nHGPBb8qt37PGqcXIjOEtcsopHhtLDL4bzCkkUEZYl3sIo4S45YRDdt9wqdY5wA1xOZE8TWOzTcFSuz1yHvWhQdbSMqngnQfEjESD+ODvtUOxbdQv1G2j5IMiRS02pitbLUUqx95bDsCk754QRDn6LNVO/T5po5lnRjbKZdnaOmXZvXmIMp0ATvh/skko26XasZSMBXDhK1fyymiv+HImsrk997PuYvGSKNl8CiRlHgknj8pHryGzMDUIQKLYhjOkO+yxLDOogJMz32Qj8aAedcxBmQzZy6ls0LXUtFwOH6I+eKlZ9UNN/VJuPMVxtIi1zHfjFQhHrDANYFgWqksxHgDeM6b2h3TQrIcGCdPTKSvIexL8PA2fSaHS1Ra9OUEYLSRln8CL6+9u0LS5lCQvyaJpREPmoHaFBf9gG1g6uTFZZIRN92+b3YjjVhBu/n2GbLjv6Ck9a8ChqypJQuSVAC7WnFBWmyR5YXAjzjo9uQi2wtaFeGL+giSm5n1IIWhMnlFdF1h4HPO4AbyQZ4aO3OGGqwPqJPvqce3Y/130mkVQ5Xn6Lk5tn2tHgSVym8DSTDAEc2YNUm8puHPER6D4uCzbGNkF4QjGgC2fP0AlFXbRXVmQkLhP8h6ZhNkCZHYNSj7YJX8kU60dR+8zmHBbvXUq97YO16tRR2Le91P+qNuPCtEtabrOC0WgMeE2EyKi8URfVNdOnvNcCrV3qwEy6EVZh31HLg4K5TpGd4o06LQrPZbLey3LkyhkFc4vZHY9FyS/jaSMDF0P4FjBMsxVspGFpyO2UDfWCf/SI8bMXKgvuxcWCq6Fw0Fte9NQRHoYg7ZHFaUAfTtWKh30FkNLH+xBA1572WLiJwOAsiawd5yZIjptImXQq0pi6c4Z0r8JjK6Ze5029m1p7zh2qYUnMQJ0SsqSq4ggyMcYbBCA3E/m4vOOqnMaksuJ24E0Q8YR4JSVBJtER/aM/2v+zKAhXmGCrOuFQUEDvvw/mSS1M+XNTXbMrNBIglNvSCSSEiI8gydANeGggnX0QaU7Chu9RGRrlKhPY8zp5/uep0zfds1RvAbWtasCe3S3jQkSK4iE1M1Km0Tuc2pQ6smj/rafYK3CEt54Bdl1ZQ5Fxxf71kqIjUVUTnlV6szggUx/eh344CS5pNFfA/fYBSDbSwlajB6loOpn6KL/OfBmKniKyoX+03AZbAJM3TalNOxXQy39AR118ZiJgv0Rv+b2NWEB0/LD/hu6n/qTHk9+8o9XfnaYa64vlqWIifm8QOBkUntdyUND2FEU1OH/Lyke5AEyqYqKzbWIHswMmg1wuaVnutxjzyx9+Pi+dp98z0HEK9T8N3beECKudZo1+uTnSKXNycZQNNo3eIdX5Cv4RRgqqmtAcgzwZRtcwg1te9Tr1/4YMgkkUW8AK1FHOc= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77497bd4-7221-47a0-954d-08dd90f6606e X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2025 01:43:21.2970 (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: zNAIJiKaoOChXCA/smNyWbxH9B9LMCtANnztBhPPL9I37WlXTYObMoc0Jr6kLPlbSezigkiyT47GEWhMnLQa/m9Unz+vOtlg6C4b+U1sIFFaSk8plljM5F20r7CtoaIF X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB6824 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 --- 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 9946f12254b39..b456e096f138f 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 Mon May 12 01:43:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 890365 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010063.outbound.protection.outlook.com [52.101.228.63]) (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 1587819F42D; Mon, 12 May 2025 01:43:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747014221; cv=fail; b=f7W1AUdMOviG5rxJ3csUCeGZgN4PTZwfsvV5aaXpS+37hn/MMutrts2cu2TkrTKigkn/KmovIJRqBQZM/0xRtpKZbN/88/ET58ohSbKqwZVJtSAeES7RCEQcU7bkGdOwFx4/r+/GLPHBqy0bElNVOCEyc41E7KhxFHmt9kxy55U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747014221; c=relaxed/simple; bh=2149T4GEHH0V45rlc4l3W6V0AACg+SMbXMud2OUJaQo=; h=Message-ID:From:Subject:To:In-Reply-To:References:Content-Type: Date:MIME-Version; b=mywWK9bvRmTN+ftLgWiSTa9cfb1GB22gOsLFN8eTQKDQkEZ/TFaZthJ6EVf8ZmDO8RYtKIz5vm4tgvbIV3s7dWX3Q9zTQkr+IUmw/zKri1G5oDdPKRa1+Uy3w8ZD0uOGjTY9nF4z1+LAZZC2o2l4fEKmdZVE6Z07dvDyY47XWX0= 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=VqYFZt9i; arc=fail smtp.client-ip=52.101.228.63 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="VqYFZt9i" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Q2rR84oBuAgJYydv5nJ7VcNzjZMJqzfdggwdmQUvAyvxFisiucOJoOUDmXKnOTbGGSJTZalYNXYj13i5wOaRCEynHkI2QcF/KtqmS0aVii+e4CIDYQzPgwIJ/DjiZAgce3DPn1+lqDFb/8+zeNg0RsdDcokvnvgkjys7Qu0T5UYtQkyvctNo6+1nFbMNpdLuk19yNgk+8dgF5g+2Q/j8j+R2gN273GukyA6Hd0STPH77i/7zhE0boysXUDEydBHhXdp2QmHdCI6J9XI+lA8hzbvtX/jPORRWbdkBwFvhpuQIHUgbUTe+sEXuFDqalX9XcERPcqAeb94VrVhn2iDrQA== 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=XdE/3ESDd8mGNaV3akhUHKowWuI8ktWXeK+Oj+x3hxw=; b=mqheVKIcPuKjjxd5ZqV9B/3ORKZVhr4CReZQTn7Q9eLNx77Sb8NFYy4Lu9pe3rUGnr4PNb2HQcVIrWJUDnh5AAwNX9SRAuAEkgPvlgJDcdR++m1LkaDgnDIMlJAfwU47WaV5OyhOWBPwYiIUabuehiHM54U9NzZ9np+tV2dJL9cxxj+qkacGWsW2fRAwlponOytxYRKI/Py/P4sRq0FL6pn8tZSTusbkAJrU16rdVSyL89abXd4YfBX7GVd9tGZnGf3dleCydOa7Y08itKsHubCEzb61085psfpIRxcQkkwT4f5fzEE/P0rLeMVAhgdmZ7RaJSgCfEuzM1jxr2j7WA== 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=XdE/3ESDd8mGNaV3akhUHKowWuI8ktWXeK+Oj+x3hxw=; b=VqYFZt9iu+Asw/e9iu+eiil8GJ6vBz2CFWrXW/6c7oGvMTSPa2sG+LN3e26cbO9LwF5mTgxfCDKe66QoxnxQfSwyt3H77qD5EhK3/LKNL2T7DIIv6If+5iE06ypAM/KGpPPF9ojrpnyLrKntS5GnaXR7OCFU2ZFV+qlA2u/DFmc= 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 OS3PR01MB6824.jpnprd01.prod.outlook.com (2603:1096:604:117::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.29; Mon, 12 May 2025 01:43:37 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8722.027; Mon, 12 May 2025 01:43:37 +0000 Message-ID: <87o6vyy56f.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87r00uy57x.wl-kuninori.morimoto.gx@renesas.com> References: <87r00uy57x.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 12 May 2025 01:43:37 +0000 X-ClientProxiedBy: TYCP286CA0120.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::20) 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_|OS3PR01MB6824:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e74bda6-f759-4d5f-f46b-08dd90f669f7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: WRn2xUjU/1inKFPUI6Fl6H92mJTdLjPTmw8/P4cjfwKefwPigE4KfKS4xIC2Gt+GBKhy9wFcj5fs9gnpuXV+S+0RwLTIVVMj9gG0mtBRTDid/uPIAbLL+QX2G/ksbl6JCUr46BOyVKESxIyA4CJsB8y74tenwkdOtx+JbUH2EpCcuFuBK1LdcIidnv6qcapio/Od3S2yGO46jK4OiHr6vG1mjBY0jUFPiMU6ucMuKpw0lQYbaX1c0UFmWq2440+6ps3v3ooiK7hmQ9hk5eZYpBlOFnj2VlFvczPzzZ8lxu9LbX7Jxzes6PeNESyDHzxTrPnilajW2oSKGLcg9dx2Yz52oW395+p1ndLibj9bJ30KeuM5+KePFi7BVS2zGOjUoelS8Xz+wpqL4B6SZHpy73lcn2oz8MWNATX4Klhs+lBfjMRGJLyByagdu+JoIsl2tkR5zFjy2VlpCd9QAPspt5qD9pLmU6mFRQdCesz49BHZLaUdLVvcUvzon02cgyRaGPi7iLxXDsY+8dc6wJv84Rmj+RmPZ9oQeMzlfMAUbo9XAVe1wEHUk794/DP+KshkRZmKfj/BYapoUIJlkeNtgj0Hgh1blCCamtassd/mpM/R7lJK7H9rbcwme/cjAxSfcs6QijbnwvtOrom3f9xL64B8MHcEeQothWT1U6icpbpUb16N8SX6hD1MVWqMeNjvPkbKouuJShGoDcdoqhzUkFNYpD+bf7YPSDovV16FxLsrmcmc7L/tqoWqph1745q1ovCJYQNVw4iif1rmuL2YnmY0Vkef36caF0YGTxN1WgyJYOIy3sRLHpr9cDqCctDo+p/VqXj+Mkug3gCAWBQoJswBYXnqQHaAPfHqWEokBrY+NB8DJASqd69UfL1kyVov0Ztvsb7Ex/3xLIJkIqYK0KE9wyjP0YxWxP7+RCzchYF14XGTdaKuBOBXQXLxM4AvW9KM3QLBxFWsLbal7EvTDGgLNQERdu8z8TQpN+018NJYBZ4n3agIYnV3bWEeea9ACcmUz1nXTVu1XNg8meBEQnI5LrLN1l/61C0HNae+iJzaOkDBiFnnNQn/Arrj2rJKbqk5Ghx0gzx+I+fuD1LdXTwBX4BswfQEU8uMjdG2WnD8p5Tft+dpyuZ57ERIXXDswkWraTrtIMzmMT53ZLv40/s6iOAa0gx7x+Yo/ea8Vq98C3fhm6RMriB56rghEtTC9nZGWYx4N6Uwh3tyTUbw+9jpUowQRs9KY9zcgQj/PF3zSJmpjp07+r+pevA5AkD9gjXGB+T1H8r0fHoid7VDalq3E5+ejj0tpkgU7eOaeXnPSVT4/TzfXE7tCpNMvZQFuCPN36MdDGFimzSsTSdW7Wc2cyt0YsD3Xz3+iOTsvH8Ej6NPeZip1xDk+z5b6yJFWID4CeN+vlmArtj5W+8GV+Yfm5XcrAvVH/TUVP8JPx63y+dOviX5jRAV8+tJs0BT1SWcqLw7oiVaLheVnZ4P2A== 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)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SunmYfFXZLeTa/Y6IkFPZWHSdt6DZL5pDV+UqFuOJTLOrZFrsb+3M9+/cZneMS+ZTyECIG8ZNuFMZwBrNH9RRxho3lLpIWA+sgbHaT/SFcIdtyRCtfXGoQ2Yc6vHhww356JWIfeoq0JPvKyguBJMkBQ534f4J2KRvfsi+6c+7ICVOp2eUEke3vqNGr0lxivLtDCKCvu0VEZXB0fvWZkW9JV/PkgZZWvNfEQIhnKuNbN9gAp6csoxp2VQybYRYmdmY/3BI6ODN0WZH8t0nVbqsWmDJ0bwSPzdZ+L6Olz+LXMXBzVozab3iTcP3dhLM6ulAXa8tz6vmr1UopEpGaEKiJlZYPTuWPikdKOlXEtqrqmwElcw/Mb7DNc0hJXKiAqM9zTdp1tuP4Qw+RDvqyTAUlXS4iKjFZdn1M8SCOQEf5VscPWx5TgSAW3JOlWiZ8F1MXrACK24wtOYAM4K4hjCY7TYq3TXLp4o6due3BMBWZiqtqv+lYUYg3lOTiteC1blK1Dksb3Jhems+K5lir573jBCX/NYAA8ppp8lHQE4PQEm6V58lVB0v1fVv2nMwMfrocoSsJUBX7kcSQ17qwNrr56ItO8QhCU1uKCqNY6KyNqxN5F0bhcCcayPdDM8pxX19EVLS8b3B7Riyn+JAVLJkjlz6d3vmEJGTEcznGO9mGbbPbUHgKTZ9E2yKzNCXCRvdXVsKwDDo+TEMRfBNjp4EhoSCfD4p6cgrI5zo5SXX2sKaJ/Uh9pdmgABLQUeFQmxwqtQb8n2mfeiRvOuWFpcTqGO+VTWGWHJUk/85R4viE9oS25h0fiA1Jx/H9SslcwfU3W0BPk+ada5ifonOVztEN0ODxW1ZhfyhKQAhv6+YYUwDXGtuaAqx800MRQUdK/KORGrKkQvOGFipLROgxFoXlh5VNJjqLJGXTPVLMCYx8FpuTjfLrlG/dXaB5bwb3i+4JBOAfWElER5Ueoyvn5FMnqJN03aCw+FCntOOQcYbdv7BgwymYJzC+T4iHOFWflBRrcCaOqkJaf//4DvE3JrByjoxVzDRWlBxBdaCT4hiQqgEZGrlDKyBEpYG1NM1M8HFkCylKmpzTs30Su87MBdyqj45ImvRBgXoxX/Z4W+IRQuO6fS1AbWkqu18fcD3utVgJSXWpAWyLhBhy2WNamWlsLXnRizOjCbpSqn/a7ksOBuMGLatWV3UDUACCtuRK6RDVKUkdyw5oKk8PRazAEIoWQSKp8o/ikNl5L2XnSixlCpkODsgIcW9guVeeZnTRmALfcaPrdnanN4bfMtQwGPuS07m1lN/amytOcZ23vaOeLosIU9WpsGJDUsV9m1R8r4yApMguD6UHeWXRSING7w13i/+mx2tzyfdCUlRgkudZ61VJ9XehK5IHUv0HqA6TXZqxwW4UZYj0JAS48Q//36GatLGNRDzH4Xj+9D/gfL3norXyDsF/ZoDZsbmd88BgA29bNiZGsn19E3W1EOKpsYD8KMR7KC6Wc69dZvcxaljUJ5mFCtKediOHjffn/JY4Fx/GNOLs5c2WjozqIkELuO8QJCwXcOd/wgYBzsgZ1kdQBe8n2KGepEOSaS1cOjwWeUpze4l2Ka/29lrU+UKskkIWx0WDDXZ/ILH5RxeexEEQE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e74bda6-f759-4d5f-f46b-08dd90f669f7 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2025 01:43:37.1622 (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: QR1C7tQD7oRcR2LWB7LhaWSbfQf3g7UTesgEHLXGtxI/55LnHkJXlQSDVvFzmo7Cl6H59fJTNQ2PmFvR17Y19RDEiOlflBPAZqnY6MgzEpk903Z4i4lT7iDP3Ja/1obR X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB6824 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 ab615ec113d22..80569209ce051 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 Mon May 12 01:43:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 889445 Received: from OS0P286CU011.outbound.protection.outlook.com (mail-japanwestazon11010000.outbound.protection.outlook.com [52.101.228.0]) (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 289EB19F42D; Mon, 12 May 2025 01:43:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.228.0 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747014225; cv=fail; b=Ae//54VhLM30GCw98xw5C0AWpesnbVbh9KF5RzGx8DIuo20iwEWH0/ZiUKlu/64JIds7UKlrpZsdOznfK2+eRWeSBWH03uPyLYQGNKWJSxFl1AZDW5hWL9tanh9bHjpKSboJikeFk2pv6CDMpYP2yXFYNv7wb87K/KqegUgt8G0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747014225; c=relaxed/simple; bh=ZORfbgtL28zWAsWqPJ8CayE7dMYJtSqaVhfHY+ulevk=; h=Message-ID:From:Subject:To:In-Reply-To:References:Content-Type: Date:MIME-Version; b=A4RYeFQF8CqhxGriHwnXtHD4uroWXqaoNJslZpZ0M5y7xLl/Li16rk7ZDZiDPEeYX+GETidzqNpdl0NYNDQ0QSIbT7L32h5udyZVPkZsCa+6xE1Od3iYKXj0AB0Gd4zOGTdrXlJeIMOUfzPzAOnqMzkIPt+sFj8O6O02hjmyT6U= 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=RHYdr0Ra; arc=fail smtp.client-ip=52.101.228.0 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="RHYdr0Ra" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qvDIxQhpGfV63zEHluH4Tsx9tySi6lmllK+O9jqNOdNczoN4QvR8S8bIIJYSJL/9RY5S4qwHYsD3e8SEdz4QAsD39YiMjMDpAKF4bwlwpocY4yyNkI0q9zjY2KWWnh8JLf4WXTK9l9Sgyjz51znkVexWteCC63ABE87GRMncP9nADfywrpB+FFn6+aGLKVMe1BBCmPafbFdLZ7jW6090p4RxnG4KVFPwSbOsgRzhDb+C9r11RGGICAs21vrUKa3+gqzju2c+xpLpqPiNh0OiAK4LeG9/3KSIgoOV5HJ8B9Xjxi41N8pXNqz9za5jYwmB0agRfdr1rHKGYaTxu/wjgw== 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=u+rhdbHwlBSNavPGZWUkZlACZbK8meu9lWj+oCBPckI=; b=ZxxoXBpw4CXB3iXxVAQ8rRIsPu1X36R1QuckaIyfNzS5U+WuXeVLDRJe5sOqsxvTQYlHcTZOv+hFMtL0zMDF/aP0rAwSSgHSpyScyol4LokH6lp/ldiaitybbtM6s275AYpnJS9aCZz0o4Kazhw0xRW2m4wpJPFtkN9dL+qYk33+bwv8lB0GMTctvNWhPtOH7PnBgphUZBa6hcDxO2RSYRH9ebO0lU5bkh8zY6t4GwY86TSBZvxMPV0GEC9bbdVnNi50y6iL1NVid2kSPxNOhye7vbr46pvTPJobnWGj5o1rxMIBJEYyl+9SgzaMaphsNHjZX7XNiujWLL5c2AA9WA== 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=u+rhdbHwlBSNavPGZWUkZlACZbK8meu9lWj+oCBPckI=; b=RHYdr0Ra6VJ1Z2OXRvg7mFE0MgRRkZirH9stIAdRaMg6ojn5PGPYOekojxknR7b1d4NcyQaQTxdgEcoS8M3pP1dKHtlBW7hTN7BqxtzQSynx8TtymBemcH+pzQAFxs9zqlQlNXdM0KCQyX5qgWr+0lzzHs0Ny1Yvi8Q9vpNcxMs= 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 OS3PR01MB6824.jpnprd01.prod.outlook.com (2603:1096:604:117::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.29; Mon, 12 May 2025 01:43:42 +0000 Received: from TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11]) by TYCPR01MB10914.jpnprd01.prod.outlook.com ([fe80::c568:1028:2fd1:6e11%5]) with mapi id 15.20.8722.027; Mon, 12 May 2025 01:43:42 +0000 Message-ID: <87msbiy56a.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 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: <87r00uy57x.wl-kuninori.morimoto.gx@renesas.com> References: <87r00uy57x.wl-kuninori.morimoto.gx@renesas.com> Date: Mon, 12 May 2025 01:43:41 +0000 X-ClientProxiedBy: TYCP286CA0022.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:263::8) 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_|OS3PR01MB6824:EE_ X-MS-Office365-Filtering-Correlation-Id: 0398b599-1f99-4448-983f-08dd90f66ce7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: edmgllEM54LeoX2wumtjrfPkCP+pDN0x8H88V9YYNPVNESrzQWSF9JF8HzZTA7n7Xf841QhfMQ5xBQLAaSFG9MTAPlRsndhS4a0V8BOtYzGMjRT4HAO85DliqHSl+BLKXoLN4pq764hvo2+uD5LZnPv/AOTCqdA7/Y2/5C6+gS7dQmLJSjHvChUwZF/zw7lLz8ik7qky52dmfqt/9RHnxBJi473BaPZWgztpqrTGIUmeN5NiZ7LI8bJKXzbbm4r9aLiXy8KrZCDWk0zOIOsquz5tFCa/i/Dh+LRXIdX2fw84prAbSmPealSOZEIKmjB2qvfkhpgcm9AvMvu3FaOQu+CmLxSHh1mmlfx852gNnTt6qAEGwTOnzoxRBpb6D58UhBNazGKC6DyeeUTYF1lZqgjsgk0QzR51rWzQi2uvh77tJ16yjxQ8RdLe/lBltAWpCEt2dm6SJujpErJ4oUioFUG4Bs1MDnzRD4nIoFDSk0ZkkgkUjLIKGwTfwNlT5Jizih3V2U5pY5bBylZ2pRfaWQQT677C+viHV8B7jCZnZZmrCHdRbCbASdIzhJo2vtHRllJRuvRIG50w1gktEbryXE1pn4ikAbaJJrm6UNj0RvYRuTu7qAugdhYidPP953p23bpvBE56bTujLE79PKDGOaifVdnVG3jtyTpt4WXDff/tRHEPZBY15tKqGySqukTbcHn+k25Qn9o29YDjAs3z6r2biOJSmNphuKaskQ9PPvJsHVTW4motLLnwDjNB3nL9zAXV2mRU0w1/yxtbFhyLUhr9Ur6wgsrsUw0l93+1yvdP1Cuk/rjiZJrRq4D3NnWCfiqT6SCnl14iKblRBC8v+7EwyTdO7ykXXw57d6TAMFG5AR27ZvjbUiyYWW7Ia1jHCAHL6VAyslvA8f+/ThOgtVkfZ9nQT6yDPXO78zeygBfPQSsgaVXQ6swr+Qf+DLb+1O/6cgNwD/r5fjIMZ731bjopJ1npaI3TEIGZG7brRibay2JKqUhffvXjExXu6oppPg8y5979++vu0vohALxfOzSJ0oCB/yScm2C9hsXWi8f9MAeIW9VhCp/MlHdBG52sXemlD1YRZIB5wsPUZgx9NILoDkPjsog3iRlTRhcLHZhBsGxewUAKhVJw0MTUZUqy1fYxuUCtd87+qKnLoUfZoOJrZdgMuMdKfBVUNIMWg4/Rm4DdOBD4GBDLacnNCfDWFAsqXwC0hRkuWpkmnotP/gmDC84mmNLLBtSPFe1S1jEN9y5aVdcx/M6d0OXLn3Ix17dCHmPH+U3NfUAS+CHic/S32y7cxryXv1TpyKAlxIzeKWYUDJobgg2ouPxWogZTjBbXuEbzVTbzRtdQZ5mTCmKiyJ1rXj21dt1I0zruAoOGaQT6WmdOrosNtWz9/1jp4taGcgVhkhpCEzO4lAofk33MnQXNlrNhl14VSuTXYck0kSprrW3dT3q7sv0JRBeDr9FJRoNSebp0YLSrBdo6Bw== 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)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nN2+uIeJZwatwv50R4pmwAHz83N6Iapwvo+6cEaPxBQ6eiA89G/MZotYryh2Q0Na4mMcicHXFS2XaFk5/7iTIAgPvDmhZ+t1rzQdE51Or2g4UTyW6Qn0GuVw7PiwpBhI56zbpGNWm+DjMpPkMg7Z/K52rqz2DibLqVrS/cO7RfU/z3orj3odeXn7a4SSkeaNHmmeoynGwwJEBq82USxhEN/beJl5TVk1WZH2/rpRvY4z2Q0sDItZlqViIZ6aojBCgDrgSJeK4FYrrsq8ege8wW60RNE9RaVhkOgwLc/jK0Ah0z/rtasXsEcRzidz4TejyKzg47R2MNroj84UaBAXrjQoVANwiN+uOkDMbbW3tP6l6xy3IZ/UuzBtvaVTX2DVWlqMjEhzg8F9rqa/n4rHbrhscJqk8yAz8FlBFX0QrBeX5R0BnTe6jw9lMrlmG0/p2+GvcHf1DYMcKVjjdpxKXZQAObPc3gK5eZBzTiTRWaKj5opEOoqB9JiJ42iXTwt5dW0dAAe9yQxItLHi1rAnm0li+wZz5NZJa4uZHJE5ZA8zj3nszhjMiHFm8z3HhrvB+zroZ/NuFuF5P4SwUhi8sxvEmBIowIf4mCciVt1o6PJ87so25m0FJzEYivpk5agMVWazD1sN7u/ZcYS/hWSYu5JHjCZccTtHqfs3B0HweRg2n5RdhCSgceQNXCCH2mh3yQyx3zCSBo5AXxeMBPJDI2JMPVDD3nhwdlhyQw55xqDVC7CW4v32aVdAiQJ+ae91nesecSxjySY+izLMbyi9bP9FgKdEYbPFQfNG6KM/1qZ+oRXFUm0cICXuUsD34AhYqoVkPP4GEC3QLXRD2dG/RTkvI8Wr+4gUtptBAqL2vPCG+/S+MUxtsOD4+kW7aOFU9rIeu2DFhiaz3/Lq0erv7w+yA3CAChMYY2uVP6trgPOeWgxh94gRFNrpa85N4l8LKt1KIkCpeI3XCswqKVw28SJ5qPe/G4AfdFV8+0Q45B6njo2gx9AjBlU0CMWSEOacPIJz3k57WLkKCejZdnkistJ/YyGb05l5f9cea/YdYijlr3B0HiPCkLwEvTaSuvAz6A1Xvkvo3HS23fMb2MAtbTfU0veAExoUGUnU1vhWMQewQP0ZYgJOwRg0Y0ds/CERVsqO+7THRujov5C82rystuxWeha3psbTzFMlukgQLNw8huSlgchZrUSNvgIxYSMuisQWGZ7gLe+Iqme1FmddFH2+CFSkIY421HyZ04vf/f6Ee7IdFs5wu1HZTWWkH0cbLa1L7iMNzm68eKF6PoxA2dfv/aE/Hm/2maN2a/9T95N6TVBUd/hFCXjOjLXUdjG0q/5rQj5bHnmzJGxlqVaNSENSn8A4g5bmDZSnNDVUsOuJ15nWXgMISs1juAUYW1Q2mRoUvaDli+uwVDZluwicmAxSFF8i+ZDFQx2uI68CK4imFGBR+yuiQdy7Tm19Fg1EjDDPwGbHRmjmeLlGQgN4aK8Qa2ioKH80IS3JmCh4oGzn0USqEj7uBeTlQ5Lgs1PxEtcyMqyqzR4q28EXvMVvXziJIxWJElLdMYJHikd5DpvHI1Ds6neuFCI7ODUvSqdKOK2kusVhx22MYcxGDMl0yJunNpzmFefaelm+lLNIhi8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0398b599-1f99-4448-983f-08dd90f66ce7 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2025 01:43:42.1198 (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: cNn6+QiqSQIbdaiREP791oi/MI7XWUMQAkc5WTXeOJSGktPwLOwZyT8a8wRVgVMuL8Hk2W/3VEgLv+zpxkt2bClhZ2Glpic1hX5RIvtZs9cGheabW0MA5hBMu68TzhVt X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB6824 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 61534ac0edd1d..2caa807c6249c 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 80569209ce051..39ecf0123a444 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;