From patchwork Fri Aug 9 04:22:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 13758358 Received: from TY3P286CU002.outbound.protection.outlook.com (mail-japaneastazon11010037.outbound.protection.outlook.com [52.101.229.37]) (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 C33D12208E; Fri, 9 Aug 2024 04:22:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.229.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723177368; cv=fail; b=h+iVp8HnSm9vaFbM65pJWXb9Lb9dr15e7ZbxZuauV5kP6G5lvT1o9lHjr49UqwAh8eoNEs7EFe1LKkY2qLpJOLtKlrCQnHW4A7/wg0euLr+eX1QCBxafqh2FzWmRG5/IQBo1UJc11mEi6TjzlFUEMhHvXwiMnZKbhaJCouu9d4o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723177368; c=relaxed/simple; bh=ujqNsJe/qHMVOn6/LwqKnNHq0H6XnyCb97UUoyhNh0o=; h=Message-ID:From:Subject:To:In-Reply-To:References:Content-Type: Date:MIME-Version; b=WiXhSmOMEaaAU2yzvHZmi0IkNFeBpxshbs8AmeGeZSbrglTSCzNInNoI+6P12uEC29UWvaHlreQWJjHsgDKXa5rU6jQ/CeQK/sI+a5nTGwKgGNiK913Y3YSBJkrvVCvT01vl1Km4XvTTeda3u+EzM3dTnl9u7pTDMVa30AN9RyI= 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=EXIzGHr8; arc=fail smtp.client-ip=52.101.229.37 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="EXIzGHr8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yFNTxjH8BvVeB5wOylXfoOvwrc0qw504jAN32+68x/HQ8IPgZg5TEKmNmC+NkdDopEdnPpNIHFeUXce6q/A7bYp8CyEoKsNT5n+OFxLmnlgNJMC+O7CiIl8HQ2/58Z7oom8bTsRcxHJOI67K6KeK14D/oiFMyedxPQvKK35ChX4AfJczQjCEmRIcJGtRFy5P2cOTTNFvkZF1ugPDkE6hjdtQITmrt2y24EcWtWpHiVwE5vebdtPDPqrbkqbh9kv8U7B8bywptHOcxAHmvd4mCxvsxqQDDukaYji4GqSryzAi0lVt9ImuC0iSi6P0I7a7dWUCPssMSXRAYouGCs6Beg== 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=nnM/bVJH/7MwtVBHhQABMeeqNeBOZIi/dXjU+gs2Who=; b=qb5UCQxmJSPrhGO1MoFFcfaSGbmvfkulgg3CKRRrHyvk1lui7bdReQxqrYSRCaKCEwmIgn+O8XcIW34lRg8ADLSx4JLIq4g/FFaAVZ6SSu4vgEH/mJykrAPe7MRwqPgswUZ6/C64Ut5alxlmfGkkwnKtz09Ivw7PEMOFTbWKvHKMvexVgoD4d0EHNZlkh8k8TlhA3l7+Sl1U6Nr06HOkBcMtN8npdKGBgs060Is+9zWMdPFnV7agMagePZaI+YELwdxMgfx+7U5VTr1iZoiNIZ75wnZW645E445h9Hug1B4ZAX/2TUxeDOL0vmHlxxcBZuVFsFeexOojlUqmaGZ/gQ== 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=nnM/bVJH/7MwtVBHhQABMeeqNeBOZIi/dXjU+gs2Who=; b=EXIzGHr8pHvYZ9XPkdRHXTDbKpJnn4dpwjLEqcqG5zRT0fteSQ4HuZBIjxSDA9VZ1OmjpdXTb9RrlvwKy3QHTKHF3f+vP1FN04SIgI/SWCzq8mnrXEt0NRHwotCzNSIuXFAQNUkHOmpelEysQgwYRG08n6wyyC+n35rBgJiHWKI= 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 OS3PR01MB9639.jpnprd01.prod.outlook.com (2603:1096:604:1cf::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.15; Fri, 9 Aug 2024 04:22:44 +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.7849.014; Fri, 9 Aug 2024 04:22:44 +0000 Message-ID: <87zfpm72b0.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH v2 4/9] ASoC: rcar_snd: use new of_graph functions User-Agent: Wanderlust/2.15.9 Emacs/29.3 Mule/6.0 To: Daniel Vetter , David Airlie , Helge Deller , Jaroslav Kysela , Laurent Pinchart , Liam Girdwood , Maarten Lankhorst , Mark Brown , Mauro Carvalho Chehab , Maxime Ripard , Michal Simek , Rob Herring , Saravana Kannan , Takashi Iwai , Thomas Zimmermann , Tomi Valkeinen , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-fbdev@vger.kernel.org, linux-media@vger.kernel.org, linux-omap@vger.kernel.org, linux-sound@vger.kernel.org In-Reply-To: <875xsa8gws.wl-kuninori.morimoto.gx@renesas.com> References: <875xsa8gws.wl-kuninori.morimoto.gx@renesas.com> Date: Fri, 9 Aug 2024 04:22:44 +0000 X-ClientProxiedBy: TYCP286CA0358.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:7c::9) To TYCPR01MB10914.jpnprd01.prod.outlook.com (2603:1096:400:3a9::11) Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TYCPR01MB10914:EE_|OS3PR01MB9639:EE_ X-MS-Office365-Filtering-Correlation-Id: dea819a0-5db5-487e-cef5-08dcb82aea92 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|1800799024|376014|366016|921020|38350700014; X-Microsoft-Antispam-Message-Info: eewj0mtYeuLtDRUo7bnrr9dK5KW3YVnD8byggA6S2ogbfXs4Mu9/skOGI3IwWWp/umoWllPbRlysckZQOTm6k3Z7+BscZsW3pZOp7F9ztZLDLHaes0bAbb4WWhqRDm5IS/yAsAQa9fLz/7PmjSOZNBD8zIwTUjLJjwzbxc0dqopbXOYoyS9d2XLgVViaPr8e04Uh90qA1qT11zwRFnqBGND/GeBRA2tWOyjuudwpZMQKMwvQgD4wbS4hLzkjr1rUDCIiYT72wmAa2TgArdqvZxIeKhu0SCEHoIjS1YBsiw85eCPLJzNlq0HrTVoJjwIPDmESdN0veDAWfLGGYtKFx6QD2KK+DOOxvDwFe9hqunr1pc8vMWjJL5qji8xKtcK0fHR4ZOvyhjzKn670ywo45O/I4GDMIiQTX69iPCHLAhQu7Z3YGU8hC6VD01lu6AnqVN3lC2U5q13gstY5xtb6PgN+W1/EpqBLoqBtxldDUtJC0XX0Vi2ipFcxjmhK0dqojeCgsLq4Mnx2XzOD8dTZD8Yxv89H7bYNWTmYCuIQ23AhqBbUWaNev2YiuFr5CPInkY9nfJ7ru37mzqDIYTrOPuXx8bTnkJdbZi+R5gvCn0qBdFy9KXnMXcmumRQHCc1ERaigaOfQCaPEpMZW8hGOslSNg2/LYhqeYKoeR2hXz4HXMHlLA/d7EtnlFXyYfp0prR6P0+UxSQfPTnC2QNWBAou/EdV1K0izxkB/lRqACQ89T0y7wrasbuvVl9uyvpGE9HU1sccUUOTBPo2MlZcAclao6p1aKeG+QPnwEBIIzRvVp4f6PGzSLKquerwIMm/pFs909PEvOF8tpngFcDYJsRYJM556cQjdBKVbhLmGKElra46f7R4ECxWaFlDErTkwsZFZ9hu+RkfTjAoLnbgyCf1Wo2hO2prhW8arSy/YszsKDDrWOxyVPNpe71x8UaqL2DUqHzY1iqQNz9VBMzWayQboV6QyAKc1foI90oB8ckpLcwvigriXXw5IlabIPZUyYCBUSvvD6eIkGASMl4SIAne3Q7eVjU3lbQtmG5HHZlA5OzwI3aK7lR65h4S10mMA3MBJWlG14f1uHEy9JBvu1z44GruC6TMVyA22bvxobTfUsKNSrZPG2sYdN1MdyievJyhfc0ENNDq7EMVZwuP8eOmAe1KgeXRZdOhE6qH9KG7AjWrC0BElF7Y+GQXofK3JqWiBMLian4xBHLpyoIruVUJllnb6rylwDboPDkJCRDg+HVleySGC9pstIzua6NLieoXUrfzMRZ1pNXf5iSi7qKTHPK6MIf1RhezWJ4DjJTUe2VZkp2d/zkNdT817I+jxphajxL0rPDqPUTlyTxrnejBTzPv6cn5VzKtUAJtQV5yKjbQVmZrO3czndTOh9kfHakh6w7X9A78ToCEQ8gxTIw== 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)(7416014)(1800799024)(376014)(366016)(921020)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: C/LqmRyN727eznM5oRi0lLp1SEvynAm/xmp5H5Niw8K4vL2R5T61WwL0gpRY33BMam5X9Hvbw6/854D8D8/TtRXw0d6NKOEEUdsnxwfCTyoJgjL2Z9Ql+j/QNfnkyQ46EXL8tUYqU+cbqK5VdfXuow4iLxXqL5jSLU7yFXnMwms+bnTNNZrm8VjB95T5jLhjz1ENsnggbTGeTzSaCn5bEyua+Zn/P5eU0xNgz5hCvzuRVcF4BSlSQuEOJEmR1gxcRjwIh+RjvBr9NwVtJ5SHvML2dLRcEyAtj0FGB8Z/Dv3Ayig4BGZ2jOyX9IwSBXGsKC0hK88IKvtrmgNGSgEGFQVPnTpnDrXwWZBnogagEWxk091iHsNnsX6apFJm/Scz6p+FophMJogPV5BBrcUngKeeBVEbxegg07epE05oV0v3OkPbsbv+rvzf8MGjjj/aLvfheUWvAdQRdqSwj3Z0cR4DkMhtFnb3CQ3E/SPnSMmKIqGp/uPJ/3L1zJCMmLS9M9sOEfpf3yfNExvxM8Ret2D7qenjNIi3erX9Mcf047nCByrc7BOR3EpBsAOlUfahnj3J1gfGA++AjHspueWdujRKy19ZEXVwEkUBIgdA8/gPrNM7NBWkouBzD4QcniKDMIEEF4ogUleP0Qy4V3V5qcRzO8r9J+WCwRHbYvlVjSGTRwF8bkDPQyxw9tFo5xpGwD4edm+FJ0gH0/7OraU/FE3F5TyX+xuL0o/01x9ChjISCRO4p0dH9MhwO8n2UiY9ydsf+qGqmLNogus92ypSkg34lf31/zFtMVbfyZruSKsm8eeLm3lNFcLdyHwW9T7CillfGUem6+NeB5cyAVQRwejXLkpxOJ54agQ/WnsDlSLLz7aHZPziqRt1jiX066AznQom3zCAlqxbBO4s12QjzKm9jmRPqBsuc8qnA1WF+0Hh9WmdMp7jRqkwOHa5rwDN/NMzYUUYR/jjDLzZSzJunECErQMl0S+B8O8AF39q48MIxe94pMfNEO0039QpVtac1msObhVUhhQsAPkdhak8M5VLn8wGFRYLVG6MjkDEW5DFXBwSDNn/7IJOpW3CWtdZmip659yGXfNOR40O/WadJ22pO7yHE7/1n2gcyW61ALCjwvK4OBR83nzrxjqyX8m7aCTIGmd9kWb0MzeQaz0drFy4n/WW+7IvXplJDzDjGleUCyhnjFCvYOkJsQ5kptLiFjFtm/zfPtaeqNKyUZzubmjTtTIdcf+MEjwWpwIE517gaZVuqwQSE4l8DtfznI9D8nTG32vHaKDKRxo2eFrNbWRdMffMVoatgINNaTSwPFbXm9IOSJuLZxy6Wb26aS+lBI/yoKO8YivHe30pY3ap6e9kbnQ8J+9UJZp3jaUaCg0YyrskXs83w8fGuJRvo9twWyE6mWwlgrlaFDIMmbxtfpiobcvEGy6GhtwwGOPeUv5kTGRkY8YWeOADG/dyiga4QbK+KeGyegsHGvFhEfWD2qT3d69+64OiA1bICYYnRPO/vy6XZcENttI1ZBID0MEgxmq/UOi9AXzgA6bm9UoWOtS0kcf92RX2FHZiZ/rmn6V5XIFGda99LxmKiD8qqdxH3CLUhfE3VbX7lJfNHY4yb1K4tw2g7jSs2lChvVTDcS0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-Network-Message-Id: dea819a0-5db5-487e-cef5-08dcb82aea92 X-MS-Exchange-CrossTenant-AuthSource: TYCPR01MB10914.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2024 04:22:44.4304 (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: nWJFQs5Nh9J6iUbroDZAGjfBkNgtaXdJKGpcEKyWGmDDG8RgFPVl7V1M/3S9wvNOW+a498op2jDT+9JL3eIfQ9TKPyewNgmhfFpoFxhyRGBVsAhIYfMCBat/ZUZ27LYQ X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3PR01MB9639 Now we can use new port related functions for port parsing. Use it. Signed-off-by: Kuninori Morimoto Acked-by: Mark Brown --- sound/soc/sh/rcar/core.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 63b3c8bf0fde..eb146cf836eb 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1294,11 +1294,8 @@ static int rsnd_dai_of_node(struct rsnd_priv *priv, int *is_graph) /* * Audio-Graph-Card */ - for_each_child_of_node(np, ports) { - if (!of_node_name_eq(ports, "ports") && - !of_node_name_eq(ports, "port")) - continue; - priv->component_dais[i] = of_graph_get_endpoint_count(ports); + for_each_of_graph_ports(np, ports) { + priv->component_dais[i] = of_graph_get_port_count(ports); nr += priv->component_dais[i]; i++; if (i >= RSND_MAX_COMPONENT) { @@ -1506,10 +1503,7 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) struct device_node *ports; struct device_node *dai_np; - for_each_child_of_node(np, ports) { - if (!of_node_name_eq(ports, "ports") && - !of_node_name_eq(ports, "port")) - continue; + for_each_of_graph_ports(np, ports) { for_each_endpoint_of_node(ports, dai_np) { __rsnd_dai_probe(priv, dai_np, dai_np, 0, dai_i); if (!rsnd_is_gen1(priv) && !rsnd_is_gen2(priv)) {