From patchwork Fri May 16 00:46:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 890633 Received: from TYVP286CU001.outbound.protection.outlook.com (mail-japaneastazon11011025.outbound.protection.outlook.com [52.101.125.25]) (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 5E6BC4C91; Fri, 16 May 2025 00:46:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.125.25 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747356411; cv=fail; b=QmvxKobuqrGDTDlmixHb9IM3tp2eXHj+kByVGNjdhgHcxcwHrNcWDag/qfyzZDbi8DjMasXfrwLKo0AVcfkU/A8pc88dcP7BqYf/6qQLXdNFrEjrcKahKzokbZbtQYqBgbVqrpxp7rdA6IUJBQOd4cU1XPsZbB/X3gNPGnQ3zWg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747356411; c=relaxed/simple; bh=2149T4GEHH0V45rlc4l3W6V0AACg+SMbXMud2OUJaQo=; h=Message-ID:From:Subject:To:In-Reply-To:References:Content-Type: Date:MIME-Version; b=h1uovK8Blod8ArZTaZpZ45DXlgI/VJBNxFskcsy0oDWsvV0g7wxVP974Aa6gqcVk6VtfDj5S3BqPh71RP0aT+jdGv65mA+Sa5+2bejf5y5MFctewxByT9a0jXi2FdSTngom4eM/kJbcPEu0O8JFjb+XNn+wMuHbXojCNL1c1zfk= 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=AYaS2jCw; arc=fail smtp.client-ip=52.101.125.25 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="AYaS2jCw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZYiFssfasn9bi4bHt2/t8cMu30bQDLLf5NHMB46U8F59OLnmM+aX0ojMA3mhsjHwkLHwvaYZ0Nqm5F+Y1ya/+VEKpZhYRUT3bLKQqd/FVc++43nBBOq5iY3/byjeheaAbzhjR2+kPsuE2Q9oHftWw2mr92qM9XvRAHkpaee9WA7nyid7teAOZcGrqdyGg+sho2B5SOk+qmgbQDeTa0hB9ot0/NCenfcwW6J/1gaXYpwQpSkIwheSdk0a3+XhxhE5MHPbpFilgjbxP3BzWe0hBS71EbQ2E2vqnVrV9oE4rNOKqgUqaSb+vER2o8JrPwRoRgrggoC/N7eB8EC9vkpADw== 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=PYLHR800zoGMj7DlNsGl8u9RSSFCXKWVSbpswlBnLbliuJFg59NpyW8fCuzOhLKGZs8bNYMrUdogdSSnnBTbpLyZp9H3BopiP5dIcyZEt7mF7IG7lID4t1aG9894dzvybZYE6xp8GsdemkV+EBtWSa7jSHTbTTsvCNFSd3n1RWeQxvVCRYO9LvlAYPwIASQQ4ZCRpxZuLL8SosgzGUhkAS3lsyQSlW6Iufk9niN4e4Q/wnOGf+Ed1kJHEQt+qb922QGZwpsagrqA9GhrYp+Ap/O/sUjV8dcKZzDw/KwwRyvqLU8U3rdl8T2ttE11q8Nk69ccS9Bkf7UKa6FyhkKN8Q== 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=AYaS2jCwDSxk5kKT5f4G6vbhWihDkGAM26RRBis5vFiYA71m6f+8Z/bNr/ArIYzgpSOYR9jNDwX1dgJ/k2kSiQsknDnx9seMvbZhwpNcKPVVggYVzv2lKrGTNiz3+dcr3xuclLHu3Z560GCM0lHdbdTgvTpiLNao+bLLdjf+228= 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 TY3PR01MB10044.jpnprd01.prod.outlook.com (2603:1096:400:1df::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.30; Fri, 16 May 2025 00:46:47 +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.8722.031; Fri, 16 May 2025 00:46:47 +0000 Message-ID: <878qmxtma1.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v3 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: <87bjrttmbe.wl-kuninori.morimoto.gx@renesas.com> References: <87bjrttmbe.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 16 May 2025 00:46:46 +0000 X-ClientProxiedBy: TYAPR01CA0102.jpnprd01.prod.outlook.com (2603:1096:404:2a::18) 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_|TY3PR01MB10044:EE_ X-MS-Office365-Filtering-Correlation-Id: 294076b1-0a40-4f12-d8ba-08dd94132314 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: OywSSxcktWP3Psz50P7/EL+JGZqZNZMDg4Fy5wgFJsDHQJ4qSR7vq7/ZiA21/AWFdOSAV0RT6kPFGcb8omdZnDrsrzLgOlSpuNRLetN2IU9VlvKOgH/8zQhYTZozGybbMsW3CS71RgylqGd64z2t1kP6XKlG0X5UXK1Qe3fhgJutCODkJMKyjvZYwB2OCSHTbn32yA5PfC/VC09pFRZvUn41rPDIizM6j0Urgu1jMjg8U9HQifef+ggGCqwbgLJSELQWtDQ0sHf+m/Irii5t3f9+TI3BNs91E/o4VhEBXruQfYhF5f/7cijJibLLupIrWNmh43i0R1wgMPh2/OF4JBPXDBIYDxtbYYeox3/4nFoxIVk+a3CSbHUj8T9PUaHHLnx3NUcPaVw02JKO8ChCyophQ2GdExUv6BZaHVkMbgGqkTjQZREwjAfsFy8WJ4GmVs5PgxPOtfeDzr2MaHWt0QIO10ER7eeFzIQR4qESt97adM2dAvZlL/R94dWFhUpoeOcc+eZLK0lIhBP1d2UCDCddv+gOsY4AhT4qXV5kM1jXm05JjCGUhdfzk+am1xNUADkwVFmvc2NP8ggzQ3ZACwTB+W9KVAyBc2Eo47F2oJD0wNOkUyJfY4fcJ4DW7KkHubvbl0Jf+p/Em0GoPjlpQwKMQ19gJizUist+xDmRKUikSuXAh2TyC1ZFP+NvmwamOWqoASKfrAydECD/UBLhR5Stq7Gbcu2PikksvJx72Egh+wx6bikPVpvLXzaZnRP2ljXKfSmKSwHX0QY7dR+wMiDa5H8FvXIVwgnlx8+A5jZlucChbCfEYZaoQ40RaRix4cfkXFGZRTT5k4DvplAuj0oGpvNPRV1LWhYgY1U1o4ZdBaR26sSvjQNgQBabqhGhuKTZnCmim4mAutVQEuzfoGIQ1iKHo+LeYsBovR8lodEojOfr7JFAufW3bVn/0B05uDjrT+T/EpHzctF0NDSyASVc0v9zyFegKh1/UcB9trzyQGhyWj6yQ5oaWjqBW/4dUTrHcJQAyBPeuPEKNZY4ZemqlHtVAK5sVim3pGq7MhBiwCAbuZUxjWa0PhwiUMZMybDVutWnn4BV3TpI1XQaFdcH97C9uUvFRErP0CA6I5RkmnPP3J4cZeImVLCVsySXnhT3mkbiTEH2rjDMuuEyygomrL7f0Nz5wNmeN1894L6zZlSnnXPhv4JB3ri+scNqgngfzuu2THKAG1bHJR6GSRpgFvHHoh053K66qAh1ag8RAkmlWw720X5TIscpBc+hvigKrnqIVFcir311yldTzp7id9wyXwbaCbCPAbw83dBJUgUQRFnaGcqPoN6HXKrCyUNead7SwXABoOZjeaynfy6ucxzxMYu+P663lmRl42Lzf+1BrZOxdbA0S5EjvprlDUp1sySHzp/0Y6pLBV6ZmJrTr6p5k02oAkBqPG+IEF2Haer9Faej3Q5cyIXg1j3OBZXWDRlwG93fsGSlBZyxAA== 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)(376014)(52116014)(1800799024)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RGxCjaiutOTqhTPkvu7cJikNmyA6M/U9LqbrAZztpbcDJKoMBrtb6YiSR8DQ20Fz2MwYzVDbDsIkH83GqoOrdhh+UG8Da4wq32zI5b53egmjA240uYjO5gCugoYcNJENEdabt5ANTvCVL+zrQvX/8JRN2EBileYtuktGwdu7zF02YfHh8S2W/PG1rZEhkp0OzPCeuOfmsVGG3HP3PtIY7wr0hHNVR7uFdKppSioPNa8h4o3ZoQb6FaLYemt0g/VAtuCLqEgv3u2E3HqKYCdLrYJpRlAN8W1gWDuxdnBrBhhp4pwO7hGgLww6lAV/tcY1uymHJRWH7gvfIXC5W/xfKyyCHCKGF8miT54zgI6MABo+q15HfM3g37C8TggOoHHBynSdxtorHi91s0EjDpodAq26UBV6to4EVrzmcLvqq48EmW1UXpl5WyJNIVNMIymqe+ZLlxBm6gNWvBFJmztOIrqMBeS2ZVkcoaZfjqhQqciWDiUgBiSb3O/fV44aTRSjOM9Cpa+nAI6BPkZTrNY0X1fazY2mNrwKQSCQNDTuWt9zR6osInw2MN4saMIWWbL2DaAhAXVr0EAYiUCVvGha6TkF2NaisXxeDs4tvpCJO9fyQ12v5z/IPCjxkReXap+MA7wtpCow66YZDaxdXT5odMD8Z7zrEE8p765BdPHG+sj04y3o6BTXjdZ4F+eQv0uywh9vWUiYrX85mbhywqe8H6flg1Xhzhf15A2azLgUq3ax4+Z/qvY5T0EZV3M9r5HrFY8YOvXFHomG3VUQ4yevpsEP0okHGgQEIwSgU4ichQCvF7//BoqTtn0ctgwaX3/BjDgT2NU1tXaZR/XvZiIJBN9nbD/YZhrkwMr4wUJbkbLvgoluxZp4ztBUEaBNoxwXwINONEjEJfRK3MKs30Lwm2jf+i0k3pNEgOtVoKDJ8WA5ysyHKBBXeuhjwupeOwYCNpWrLnJaSfAWrtL41w4pdryjo1KM1vJs0F2Lex889OMwzOpS8EsxfcLGHLkfn199k0DCnnsJs21qTG3nb+Gdxduzm90A1Jr0Mljnf8Og2j8DbdF3FfH8xlp6Ff/HaM02cARKwcAVNWOFTWGLmCsWTjckhNrJPKS4jiJR7HNFXc4HILLtBeK0buYgIPZkC4yrMGMx407P3R6JxBxkjq+reSePRj8udzO+SDI2w0VCoZrgh4H8by7i9lcAW7fNgzizhwJ1Xv46NcvB6eMC1qw6LSINURQXZmibw4JJCZa4xB1mGYsaXgtdETa0okUg/QEi49iA3lDbdyvwBo9I5nfH1Wy/O0kxrTl5/40wCTOoFTnw5Cj/VTV4qhDwqPfqNlobxoNze/IwQGwWDaBkeaHK8eStKEUgJom0Y2qVsFlWJ1SsjP4RRIFDCqcBHM3/rtphWsUMrdV2n0rtKmHSywuAB/CDbfIK1fo4DzmFGZx0PtceiobExwR6L5hbcK7J/C7dfsDE9exNyWZqHbtt8rNz6nuw2J7ny4jNys/kWFoDnCoD7Fx26mj6g4vJN4imYWY+z11wam9yG/C+Jp61GcuS7iAzOySnfJTJS9hmLa0g7NFs8d1HIPfmAAzcKmf2fKUN3xY1QpLd+Iemqp6OyblLWbWJ9UutF9g4waACQJI0pR8= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: 294076b1-0a40-4f12-d8ba-08dd94132314 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2025 00:46:47.1757 (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: eOcotITKPm5ZpVOiUwyuYSqa9lh56tUd0jYtRj673KixapNhssG8/gexE6xN+bY6AKzruINrw5VtSGDoxNEdGuGiUQ9DB4t+N0fcM+N8wYRCh8LDHQmSuhrwba0KbYxC X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY3PR01MB10044 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; }