From patchwork Sat May 4 13:20:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan \(OSS\)" X-Patchwork-Id: 794888 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2069.outbound.protection.outlook.com [40.107.249.69]) (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 B2FA9374C4; Sat, 4 May 2024 13:16:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.249.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714828578; cv=fail; b=Ge+Dl22efjfI8LOretsl/vWJ/Ws00AzEerRzGY5F+GqD8ukg/MckRXzUWpCViHqP9/D/wl670LRfEvD7uaU0otmLhP8dscXI67pDiCHCU+SEMLPMa3RDh7sDHFo6gEk8BDA6AUSJdIA4a9ZWUvapVXdQ/dp9n4nPLrW8Z129IV8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714828578; c=relaxed/simple; bh=aGocML37yKFLTQmAgdHIf5uoWsvtHUPQJME8EyVoT6s=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=SGyCPYqe1yAKP1BNxwr4MOFzeDbgv1wTN5ltC/OkKrrUZfXwMstLD/QDQzTdzLJNsyCh7MQ7CfFC2diBhoZ8oZJr9Zus9Zb/7m3MFnqxGdy4ei+wVsNREbqRIBtu7L5xXIFq6CyNx5AlRyEP/YnvjkS+2oqyF1A8W+9xuReY5go= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com; spf=pass smtp.mailfrom=oss.nxp.com; dkim=pass (1024-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=LbykI/RZ; arc=fail smtp.client-ip=40.107.249.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="LbykI/RZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HjpbylIYacvnbNTWQP2eW4n5I4okmE77Ce7/Dl53/EpW4Yt8DXzAzkFvYu8UldsRbkKqZPe3VissAU7I5jfJT18hYiGAWBsdEdnKWAxcBtPOxibb3Uvon5JFSTkptfPnOy+MOP4npnLPhRn2tEFbe5z65Iz2iDYrAswN+z3Z5vb9513kV3ldW2CqleJMF/LBMywB+tgrfD1sGL75xCez5X2jjrv89l0qKlBZxw7i97RzX9mJjN/K+2COUQuDVL5mt5yS5gJnHUTzAtbOU9tYZw1tgYgDMOiZnkfllE34U/j8XoJKG2jhVj2zCGCbLpe2KUyy0a7olcgT55PALcNERw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=YyGeWpCkYZh4WcKx5URim9X/pl2xw38Z9ho8YthB/aQ=; b=dqGYH1FwLeN/qpMQsYJ0OBQXmLTP3aJUc7GzoCCWjyJrF2QvI0uVycx7CRkHbtc06SSQTJXmiPi98aUf8gG+JmiOsOJZce7M9pBhnCR5rJYGyI/FtQTsCJV3takHYFyBu5OvMG5wH+3DxvDvamud9A2R1+Q2Ji6fZKFaCngPDKCeNqgasKOdE43yAK2dV8QO6XxD96iLBsLPosTkRWwlHIfemLah8ppu6psxAyg1SCa9WNfgotSaU2gMDmZjVlSeqadnP3f6fEMXWOQ2EwK9OVhXs0rWjqLeX5R6xyLhkLhONee/sWVU+hrlwhz8XbRQi4V2NZ2Z+TyEchh4//yPTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YyGeWpCkYZh4WcKx5URim9X/pl2xw38Z9ho8YthB/aQ=; b=LbykI/RZmuGK+O14E8wO67iqZNfdyu5EQnlofWQCNSbAHiStMpPWzUmxv9UiR5GbG2yCzkxFgz1NQ+IwIUW1ySOpuWD6sM2jl05iLgCGOtZjFpdDtSOXhpaDm8KRFQiOPoJLE8ZmlMC7w+DDbq97yjKsNdcQeIQlGxagDrmT7Ms= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM9PR04MB8633.eurprd04.prod.outlook.com (2603:10a6:20b:43c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Sat, 4 May 2024 13:16:13 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::d30b:44e7:e78e:662d%4]) with mapi id 15.20.7544.036; Sat, 4 May 2024 13:16:13 +0000 From: "Peng Fan (OSS)" Date: Sat, 04 May 2024 21:20:12 +0800 Subject: [PATCH v2 14/20] pinctrl: mediatek: Use scope based of_node_put() cleanups Message-Id: <20240504-pinctrl-cleanup-v2-14-26c5f2dc1181@nxp.com> References: <20240504-pinctrl-cleanup-v2-0-26c5f2dc1181@nxp.com> In-Reply-To: <20240504-pinctrl-cleanup-v2-0-26c5f2dc1181@nxp.com> To: Linus Walleij , Thierry Reding , Jonathan Hunter , Dvorkin Dmitry , Wells Lu , Maxime Coquelin , Alexandre Torgue , Emil Renner Berthing , Jianlong Huang , Hal Feng , Orson Zhai , Baolin Wang , Chunyan Zhang , Viresh Kumar , Shiraz Hashim , soc@kernel.org, Krzysztof Kozlowski , Sylwester Nawrocki , Alim Akhtar , Geert Uytterhoeven , Patrice Chotard , Heiko Stuebner , Damien Le Moal , Ludovic Desroches , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea , Dong Aisheng , Fabio Estevam , Shawn Guo , Jacky Bai , Pengutronix Kernel Team , Chester Lin , Matthias Brugger , Ghennadi Procopciuc , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , Sascha Hauer , Andrew Jeffery , Joel Stanley , Dan Carpenter , Tony Lindgren , Stephen Warren Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, linux-samsung-soc@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-riscv@lists.infradead.org, linux-mediatek@lists.infradead.org, imx@lists.linux.dev, linux-aspeed@lists.ozlabs.org, openbmc@lists.ozlabs.org, Peng Fan X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1714828815; l=2143; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=lm1PEdHATfoxwJUL9YMs41GxvVEK/pacMdZ5mWFlWX8=; b=d8MWpOtXKNnFGmfz1eHOooCE8YCLHVTyQNBBLhSiEJgr+86Or3+ekvXynCYNgOqJisw6NtlEy IWju/BxoMOfBW/IhPYIVChwIIYZ7T5qVjSiPvU1zknqEB2Ele8EoB2c X-Developer-Key: i=peng.fan@nxp.com; a=ed25519; pk=I4sJg7atIT1g63H7bb5lDRGR2gJW14RKDD0wFL8TT1g= X-ClientProxiedBy: SG2PR06CA0230.apcprd06.prod.outlook.com (2603:1096:4:ac::14) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) Precedence: bulk X-Mailing-List: linux-samsung-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9417:EE_|AM9PR04MB8633:EE_ X-MS-Office365-Filtering-Correlation-Id: f321deef-96f6-48ee-0b73-08dc6c3c5f9b X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230031|52116005|7416005|376005|1800799015|366007|38350700005|921011; X-Microsoft-Antispam-Message-Info: =?utf-8?q?sBBy3tH1CTnhRXWFHqlvHDLqUeEybf+?= =?utf-8?q?XjGP9ce2GEr9Al8EXo6mJ/Ft58KSY65O+yB/uG+Pq91MRMmANGWmKZ3gerg0vTesU?= =?utf-8?q?b5dmSi9W5sSSmv+C7NYdouGZh3Nz/j5PV3yonPw7A6y9LLZKdz/3Kkn+K1GoC7Fya?= =?utf-8?q?qpuzIsVUUROos0IDCDUjaXMl9Ld0foj5Q+ZGrRDKAixBt2Xq0Z9sxnc6ccCgSChvG?= =?utf-8?q?56M+LvVwuB6wOxDX3huE2SR/PLjBIR1AMRR66Y6R3wQ1aSPozN/60nWlF/IiyVgkN?= =?utf-8?q?6R8kAdm2rxYnNmWPdtKlUVFtTW1n1Qqr+4ylv2S0PrJmameQPNbw3wxy6K9dbeSTN?= =?utf-8?q?BVpv90RztRqQ2IUYVAVSHZHPOtV+VN3J3XICHk0p8SbG4uWLk2OrbQYme9MwAL6qW?= =?utf-8?q?nTX1w7Xxlc8Ml1/xAchJn5AaFxd9Y3fLpv+FCN0n2MmWVp2SqTa3HftIbfCLkytzL?= =?utf-8?q?9Z0af1P/Aad/o8ZcdXHKMw0AO3y0uhjWtOmZLnvxHoCtyXbUoHGVXSr6Gz6zwiyko?= =?utf-8?q?l3wGmrrV7RexfnAVgtppeiyMYJnuQUI0wT3FVTz61wFcxC6d3ELHTUfbc8SF5xcWV?= =?utf-8?q?0XthPMXAX7BZVywH4TjGhCYV5UHJ6D2dRKino6AjjS8+dxUhQNTUvYOblXLBgXEJJ?= =?utf-8?q?qT7sFG7z46E5XR6Nfy0LhltCB9BxGBDUL2FVAQj6xICSxleyQO/Lq0Q9ZjDjcPXLi?= =?utf-8?q?3ZJoPdLirdA2dcuK0knFTVkUu8jFJFBIUH46x5wKOlIgR5BDhRKBWt49y1gPnT4E4?= =?utf-8?q?94yAjcsT4RcUATc5ry5duiBIgu2LtlmoFNyD9/YpFXWQZ09JmMQFIxhJurv94Y19a?= =?utf-8?q?xRmEkaSuEj3wi8wymPmRRLjNIjS29dEaYgpMtpJc3Jg8eMQ1jcfE59wX3juwKwLC8?= =?utf-8?q?M1swkDTnc8ksN8G6CMkKdLjhwZYhhkK9o/KL4sksqsqtnURIQwW66AJP/o24C0hU/?= =?utf-8?q?XfP72LYOLd2B3z4drc95tSXlUb4DGuS/mBR9PhqtK77dkvxKYhAJYgOiNh4KEUOsY?= =?utf-8?q?Gxd43X6tWnwdb1/3RcLPgW1Oi8JVCgIa/dZPfxmzGyZGDLmomI7FIklnSNvBR/TfR?= =?utf-8?q?K5iz/3zGIgGluc9pL4jhLClBmdHLWsxjQjKF06fRTeAhd8rqXvxpZeIU8PPq93j9N?= =?utf-8?q?OzwOZL3+dcuF0DjdkC0glVZqljx5EWWk+TxNknG7tka4+SM5O4mKoD4d/OU9CSELa?= =?utf-8?q?sQ2lD0rbVDL0/+UsSQgCajKGU6rXYHDJNKs5YiwWMmX573UXFdf1xAKQ8ve0aiP7+?= =?utf-8?q?TiHK3EV82NhhzGtWv3tRSsChYiiP4tQ4c0GA4kuFGTaAK4pCq77iXazs=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(52116005)(7416005)(376005)(1800799015)(366007)(38350700005)(921011); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?HX+iwCWM1i82tQ4cajtrqdLK22ko?= =?utf-8?q?nadUOj1OvTyy8DrQf5rJvIq4QvPsfJBiLYofc3jl2/G/vXreVL01pGRS7DszwVksG?= =?utf-8?q?7oE7+j7KzC4VmOdjg1Hr4SYw693F6pu10YJGzFMTjSV8I/Wyi1vmRehO7eQOFkYJK?= =?utf-8?q?jGzxhTVXztKKw+/tKGn4EiLUe7MGI7+VhhVgioztDZg4/yrN05wqUlxTgGe7xLZgH?= =?utf-8?q?EunZ72j0gMkob7uzZQ9+95vMisiOagUEKD2rlu+pCTa6w9cqODSgOa4NXWSmtov95?= =?utf-8?q?9DQnFe2eRuzulTs0Ci54nZsphCgiA1CtnDzyCydjwAF72B6Cok+Oeb74KVyqDrCtf?= =?utf-8?q?qPAn44tl1jItptNi9kTbA8Chm64Da1ZKAPaQQe71k8RqrDR8sdpMiTwrlp57jDqJZ?= =?utf-8?q?KQJgPQh9qtaNhzfX1lNH+eXFvPqTSFY17NAVD65Chq0ueZF3d+k9IwrRN6zWAdXGm?= =?utf-8?q?q1/HPqoyaahyhkql5rmN8bjJLWlIWePIzqNXefHvplaq0LSdkFnWE0dL9lfDYIym4?= =?utf-8?q?SV73kAGsoI/dwJ7Yw1L3Y+MnadS5dzcVVevYnRkI21iqsugcoFNiqqJuiI7DLeV2x?= =?utf-8?q?PjaSq04QBxVqevKBizMKHztXD4d4o6hjkggPBEcjQZZ76iUgl9QjUyyOcVvijOkVw?= =?utf-8?q?Sx0KtCnCcGejaJvYTQ6qbzDfbDf8nfjxnl7WZ1ZCfBKwCCriuVOH/j7lUGwhJWJvS?= =?utf-8?q?3o930t5Fk2qaMTM7Q09vADsoueGjcVRT4e2b4cV8WJBSPz0qfrS1fgDZhB3Ko61qA?= =?utf-8?q?tIdg8CMpHp/AsJBymy9eKG9rwdphFjOAopZbJfTU+9GeYaPuKkNZW1qvAiWHhPlv1?= =?utf-8?q?2lRigQu34++FrEncR+2r+5Rv+WWqCHAZb4nWvQFH6+A/B30yFwwUh/eKqNACPn2o3?= =?utf-8?q?wCMEHtZNyue33hmuFArf7IkwMFhfDa7fBitFFTN6faWwDAF5ko/tzPFOmhnH4Rftq?= =?utf-8?q?HzCr9PzeB8DwAJWS8XKYS8kQWvpFIokBOqjve4HB8bIT5I0fd/GUuSg3+GAoT5Bfj?= =?utf-8?q?SZ2qlSGAaooMPtaoaMCYdIxYNzLEorH2pj3l8pcI5BcTLCDuiDcYC6pFJDjR571Sf?= =?utf-8?q?GHhA7dWDkCsDRETqS2Bs/5lcoVmZ+D3zcBB3EsXYDc2/UmtfmPWLHPFN7sJTjNA6D?= =?utf-8?q?Q6MV15kbM+1XLucqLGVK3lEzodrBtCYZLDCwwIz8U8B4rHsCq+VYmeQAfLUixU7FX?= =?utf-8?q?xsdH9RC6L0JoRBQvTGHwp8YVC0RgsuUQczsBS/mTEVukP16r2FtHfr7A3vVTfYjQl?= =?utf-8?q?Pi1F9Kf+yJIpQXrvtmBgYsAFE+lhDfDy7UhlmacyIl+N/yKIYQPjg56Gwfdh+hcBV?= =?utf-8?q?Np27DfL8hJXB+y+zktfxyUCrEs1mLzmIhbJs0bAnVNUTG4iUQaTp2tapmLLINnEij?= =?utf-8?q?axgG2RaqK7X2KcIaAV/GVn0CGYCXK3EBaOYfnF8C1XPqr+mQ9QCdNDLQt8yqi58or?= =?utf-8?q?Yx/yw0Ia6IEpAcUMc/tP3Gz4C1M1nuMRrPA6jo7vNaMhzuZCQHzRj7mJrs6vxwrXP?= =?utf-8?q?aA9fau1ED4Xn?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f321deef-96f6-48ee-0b73-08dc6c3c5f9b X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2024 13:16:13.8452 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lasWAHSEU3CxIZoEiNBOjXZT/zjQItAD5txUd1NRZGwJarmvJdg3IsFiwxyqubcEn/E1ytvCZx3FX7rxsZyRBQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8633 From: Peng Fan Use scope based of_node_put() cleanup to simplify code. Signed-off-by: Peng Fan --- drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +--- drivers/pinctrl/mediatek/pinctrl-paris.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c index d39afc122516..91edb539925a 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c @@ -621,7 +621,6 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev, struct device_node *np_config, struct pinctrl_map **map, unsigned *num_maps) { - struct device_node *np; unsigned reserved_maps; int ret; @@ -629,12 +628,11 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev, *num_maps = 0; reserved_maps = 0; - for_each_child_of_node(np_config, np) { + for_each_child_of_node_scoped(np_config, np) { ret = mtk_pctrl_dt_subnode_to_map(pctldev, np, map, &reserved_maps, num_maps); if (ret < 0) { pinctrl_utils_free_map(pctldev, *map, *num_maps); - of_node_put(np); return ret; } } diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c index b19bc391705e..e12316c42698 100644 --- a/drivers/pinctrl/mediatek/pinctrl-paris.c +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c @@ -536,7 +536,6 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev, struct pinctrl_map **map, unsigned *num_maps) { - struct device_node *np; unsigned reserved_maps; int ret; @@ -544,13 +543,12 @@ static int mtk_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev, *num_maps = 0; reserved_maps = 0; - for_each_child_of_node(np_config, np) { + for_each_child_of_node_scoped(np_config, np) { ret = mtk_pctrl_dt_subnode_to_map(pctldev, np, map, &reserved_maps, num_maps); if (ret < 0) { pinctrl_utils_free_map(pctldev, *map, *num_maps); - of_node_put(np); return ret; } }