Received-SPF: pass (google.com: domain of linux-kernel+bounces-168682-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Date: Sat, 04 May 2024 21:20:10 +0800
Subject: [PATCH v2 12/20] pinctrl: s32cc: Use scope based of_node_put()
 cleanups
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240504-pinctrl-cleanup-v2-12-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 <linus.walleij@linaro.org>, 
 Thierry Reding <thierry.reding@gmail.com>, 
 Jonathan Hunter <jonathanh@nvidia.com>, Dvorkin Dmitry <dvorkin@tibbo.com>, 
 Wells Lu <wellslutw@gmail.com>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, 
 Alexandre Torgue <alexandre.torgue@foss.st.com>, 
 Emil Renner Berthing <kernel@esmil.dk>, 
 Jianlong Huang <jianlong.huang@starfivetech.com>, 
 Hal Feng <hal.feng@starfivetech.com>, Orson Zhai <orsonzhai@gmail.com>, 
 Baolin Wang <baolin.wang@linux.alibaba.com>, 
 Chunyan Zhang <zhang.lyra@gmail.com>, Viresh Kumar <vireshk@kernel.org>, 
 Shiraz Hashim <shiraz.linux.kernel@gmail.com>, soc@kernel.org, 
 Krzysztof Kozlowski <krzk@kernel.org>, 
 Sylwester Nawrocki <s.nawrocki@samsung.com>, 
 Alim Akhtar <alim.akhtar@samsung.com>, 
 Geert Uytterhoeven <geert+renesas@glider.be>, 
 Patrice Chotard <patrice.chotard@foss.st.com>, 
 Heiko Stuebner <heiko@sntech.de>, Damien Le Moal <dlemoal@kernel.org>, 
 Ludovic Desroches <ludovic.desroches@microchip.com>, 
 Nicolas Ferre <nicolas.ferre@microchip.com>, 
 Alexandre Belloni <alexandre.belloni@bootlin.com>, 
 Claudiu Beznea <claudiu.beznea@tuxon.dev>, 
 Dong Aisheng <aisheng.dong@nxp.com>, Fabio Estevam <festevam@gmail.com>, 
 Shawn Guo <shawnguo@kernel.org>, Jacky Bai <ping.bai@nxp.com>, 
 Pengutronix Kernel Team <kernel@pengutronix.de>, 
 Chester Lin <chester62515@gmail.com>, Matthias Brugger <mbrugger@suse.com>, 
 Ghennadi Procopciuc <ghennadi.procopciuc@oss.nxp.com>, 
 Sean Wang <sean.wang@kernel.org>, Matthias Brugger <matthias.bgg@gmail.com>, 
 AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, 
 Sascha Hauer <s.hauer@pengutronix.de>, 
 Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, 
 Dan Carpenter <dan.carpenter@linaro.org>, Tony Lindgren <tony@atomide.com>, 
 Stephen Warren <swarren@wwwdotorg.org>
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 <peng.fan@nxp.com>
Precedence: bulk
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: 0b200d19-f7e4-46c0-a449-08dc6c3c4bba
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?B?eEhMUEhleVQ5dHNIaFMvZXZEaThmWkNEd3crdGo0dXRvMUhUVGhvbEFZUDcy?=
 =?utf-8?B?N3JxMkRkeExOZ2tjcUZpLzU5Ymxtd3hJejYvQk92WFdQVjJ5Y3BEQ1FtMXhT?=
 =?utf-8?B?SytJcThEWCtEWWNDRGp2TEpBTXNnUVVNV0tjemNIUnpYY2RlajFqV0w3aThw?=
 =?utf-8?B?UXB3M0pmRnRVYWZvaE9YZnQ3UkhwOGRhV3FqcGJ5WnFVRmVQVWtPVHRVb0xO?=
 =?utf-8?B?TngxaVhpNDRLeDVFYTBaNCtmU1NnSmwydlk3b1RneitidUR5MGh4ZWl3MjBt?=
 =?utf-8?B?SnliWEdvdVVuYkgwOWc1ak1kRGFKVHZDdW1iSHU3OTF0cy82TFMzQ1VZV3c4?=
 =?utf-8?B?am03cUltWGczMnVkb3d0YUxRSU5XNXMyY3JCdVlGYm00Z05FQTJncytoTEtE?=
 =?utf-8?B?UzFMQnZnMjlZUWdMWnJ5NC8wWDExa2Qza0tmTUtSdms2TTAreU1yUmZ1MlpT?=
 =?utf-8?B?RFQ3bkU0Njd2cEhvL3RKUVlodnNjdGIybEFPQ0pwbUhOSURZcHQzd1hjWjhk?=
 =?utf-8?B?WjQvUm9UYXEyMFkvYjJReDF3ZHNpcWtOenlmVVFVUXNETVpORkhtd2NlRTky?=
 =?utf-8?B?K1dzUkJxd1dybG5nN2tva3FkejVDdUMvK0Nqei9lKzl5Q3FxQlhvQUg5SUVM?=
 =?utf-8?B?Q1BXNWs4S0lXWHFibjFjdmMyRkFhL0VSZGgrWU9zN3ZtMTJvbUQ0WWNPWHFT?=
 =?utf-8?B?VjN5U0Y4czZDcVJFdGVCNGhaNHk0SFprSTFHNStmMFFweTgyT0ZxVTBaU3Rk?=
 =?utf-8?B?dHhMZ3k2dCt2THdXNUU5Z0xselV3eEVGcUppdUd5Vko5SjZUbGVtUXYrYjdx?=
 =?utf-8?B?VjhRV1FHRHRid095VmNZNk5zSkRuRmRyWmxEUXp3QXhpYTRWSGVkRUFEcFdq?=
 =?utf-8?B?R2lLZGthMU5mNGFKL1d4L05OeFZRWGplUml2VnFZTkdXODBXYk9jc2NSTjRT?=
 =?utf-8?B?VzZpN2xFS2VJZnZlNjlGVE5oWE1SbDFnMEkwbGV4NGZoeXdmbzlDRTRrT0Rs?=
 =?utf-8?B?MDhUelk1V2dQZjVvKzIxTEZlQ1BweEQwNEhDRitiTWtvVVhqdzh3V3hiMW80?=
 =?utf-8?B?UEFJMGc2QWdKMlIySzAvWkdsOXc5aTJRWmliWTdjMUcrblhWQTBSMms2WXVw?=
 =?utf-8?B?Q0VQL01kNm1JMnNxMFRUekVQTVp2TCtMbExFa3hHalM4UDJmbWU2MGRVZVVl?=
 =?utf-8?B?aG9ibEhHSjN6eHJqS2tyeFY1NWNQbk0vYTNOWmphM0pGQ1BjcGVVUjlpb3RM?=
 =?utf-8?B?R1VUeTJBRVZNeTdkU01IaGIrMnQ3RlpuNFEvdUtNdmFQN2NWdm9iZ1BRZ0g4?=
 =?utf-8?B?OFNMb2lRSGRzT3ZJQklqV3BKQlh5YTl4YlpzZ0ZvUkt3TGNrOWp0VldQUm5o?=
 =?utf-8?B?a09jY2ZqcVBtTWdmd0hWS3dmY3puSSswaWRKQ3lxSmZCWmxsOEsxSjRJeXpT?=
 =?utf-8?B?OEFiNWRQVzlScDkxOGtaMjBLZGVqd0ovZDJWa0w0V3pKZ3pKNU0vNFkzSHU4?=
 =?utf-8?B?V3VUMFRJOHoyRlAwTUpscjNOWlMrV3ZQMGxxOGpIMUZRbE9Pa09DcTF6cFNY?=
 =?utf-8?B?VERtL0FUellpa0tteVc0NnFVa1lMRWRrYWRvUml1TE4wdlozVGM2UmdaVHFX?=
 =?utf-8?B?VnI3UXB6d0lkb0FCRlVSdU8venpBMFh5WERENXQwc0FXOG1yRWptbWRPbE1n?=
 =?utf-8?B?dkI5UWxScmRneGdmWkJCWHRzTTg4bFJTZndDbG83TDQ0ay9LOU8rSndtTmtk?=
 =?utf-8?B?aXFmQjgzaE51Z0c5bm9FUWY2dG5vSE9tUEhhMU1YTHhmT3Nld3pRRVZjSUlH?=
 =?utf-8?Q?LgRsGUyWyLAPOzeLd8VCUWsMPdczJRUT9D+Qo=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?B?cDZvNmFibnhTVDZEb0NpakZwKzJCbm8wNU5aR0d4T2tMYUFwSERWUUxacmxx?=
 =?utf-8?B?c3V4TmVWNHpWZWdWVzlyaTdrR2pwUFMyTjBwc0FUSTl6VUp2b1F2Q24xcVE5?=
 =?utf-8?B?OHFQbm96a01PMXQ1bXNXV2xTek8vSm9VSEd5NXZqNnl2R0JldlAwd1B4WWtP?=
 =?utf-8?B?amt4ZThaY3JVQ1Y5dFA2alM3NXVtZ0d6M3JTTkJ0YXl5TjhzbUZjcTZOdzA4?=
 =?utf-8?B?a1dYQUxUQTk0Z1NGZDhNY01ISEZ1V0J3KzhRODNoODE0QjM3aENBd2ZiTGoy?=
 =?utf-8?B?dmhNNkVtbEh5MlpOQWI1d2xWa3RZOHJtUGdKTUFPaFA5a0duaWxJRlBBNmM2?=
 =?utf-8?B?ZGlxMVJJeUZTRjU2R0lGRVlYMzA0aDByN0tqSXJJMzhOQ25YTThRQ2EyMkQ2?=
 =?utf-8?B?N1psZFVTRTNmeXVkNUZyazQ1UWJmZGwwbmtlcmRvVEIzYVdodVpXbDZ5a3lT?=
 =?utf-8?B?VFo4T0Y1U08reVdQSUVJd2lZOWl5UXV1WFVaN1RFWGxsUGtxNVF3V1V4Rm80?=
 =?utf-8?B?SWQ3YzRsYWtGZkJnZ2hPQW5ubVBMZ0dMSHlYNEswbjNLZzFZM1AzRElFNlFn?=
 =?utf-8?B?bzM5VWZBZ040OXNwNlgwNURVVEtXd0JWcDNxa1pLcU8rMFRtUWZQYjZWUytW?=
 =?utf-8?B?THJTWjZLU3RTZmZ3Vk9nNHNYdmhiNnpyVDFDc2FlbEVDaEdHVVkyUCtUZTl4?=
 =?utf-8?B?TEZWcjhibm1JTFJyd3lzM2xqVUN6VUhla3BBUGdrNVUzWk1rT1JPVU9sTS9D?=
 =?utf-8?B?TXJydnpoZlhVTDAzbmk4UFZ3OEUyeGlmc3VlMk0rRnVTYVFqbkprS2lGOFV2?=
 =?utf-8?B?cTE2L0JpYnEwTHlxeW1xYW1HNCswU0hrcnBXMUpUL09XYitjNyt5Qm9vVFA5?=
 =?utf-8?B?ZU50blNsWUxkRGE3Y2ZTZms4MmNyb2EyV1luTlpabEZ1ZzRjSUl1V2pkWEJz?=
 =?utf-8?B?Qm1URVFxM2crS3p2cFhKTlQ3VHFoWlBUckUwMXpackdkZUV3bE1hYWFyRkd3?=
 =?utf-8?B?QWRLYkQyYTQ3elZ0VmFPSE1yZjg3cjZ6MXJRc0RHU0JLb2FITkxRcFhoRmpC?=
 =?utf-8?B?WTFNUExtRlI0T2VzMGdrOEJKWkVHQnd2NTNvb1lWQ1QveHh2OUExNENLVFhK?=
 =?utf-8?B?ME05MXQ0c2NmLzVGL3ZkbXJsR1NnK2FHaHdlOG5vN3p4WVhMMzNua3JUcnF1?=
 =?utf-8?B?b29WM2ZDbFpETDlmTE9uVlZIWlppNU5LNWRudVNvZHBWYTBtN0VzTWNqZVZZ?=
 =?utf-8?B?a3c2WldqQzlqU2sxbzFhL3BRblkzTlpzMktEVHFRUmZkaWcvT1lEUXV5eDlG?=
 =?utf-8?B?cWdXREpRaWgzWXVVWktRMUFLd2FpTjNKa1A5b0RGdVRhQitVditJS2JBaW5Z?=
 =?utf-8?B?MGZmUkZ2VUtqR21hSjZJSklVNE5MMlJPWUxmSUExTHBkRVI5UU1kKzBpNlhL?=
 =?utf-8?B?NVF0cGQ5M3A5c1l2ZnFBa3NKZDJYWnlaNGpROXpzQ1h6b3Q3V3laaUVqUWFq?=
 =?utf-8?B?cXZzSThEeVJ5MURWSW5mRlU2S2VlSFVib2w5ZlBzcU80YlM2OTAxVmZmcW0r?=
 =?utf-8?B?ZkdFZ2phUUlqdnFXOGhaNHZqMnZHWGVvNUZScjN5ZDBSVWUyZTNwcFFDS1Nm?=
 =?utf-8?B?WE1POEhscUsvaUFqQnBCTFdIeEo4bVA1SjVlRTdndGpwcGdTVlFqaXJmQjV2?=
 =?utf-8?B?SEFqbjRGVDdralM5VU9LcjlFdEcxVUIrN1djai9URkZReG5YUHQwd01WMnJk?=
 =?utf-8?B?dHVjVFhkUVIyRk5ReEpFejAxNkh3SUIrMUFBTCswc3YvdzhTZGZ6WGxWY2RV?=
 =?utf-8?B?L3V6VDVxRHowVlpESU5RMmFZOWVJZ3hjeGRoMGxvWStPZTl3b0kySEdkOHlK?=
 =?utf-8?B?NTYvWkJFQlpHd2lBb002cGRqUUNUeGZ3ejRwR2llZFpMUEJRMDd0ZWsxZEow?=
 =?utf-8?B?UjZtYXJ5OXUwSnJYUmdzMWd1a3pnU3F2QnhoK3k4VTFZQml1alIxNXNlQkxG?=
 =?utf-8?B?elY0Lzd3aFlqdHB5VG5TNncrWUg3SVpUV0YrYkhiYzF0NU0wQkQrbDY1QnFP?=
 =?utf-8?B?QUU0c2EzTFpVOTJoZHRYNmdpVmJLbmhaeHZKYnE0bUhUNFE5QUk5U21uYVgr?=
 =?utf-8?Q?vfyGxGNZKkduzNzMELAK2Gje/?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0b200d19-f7e4-46c0-a449-08dc6c3c4bba
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:15:40.5200
 (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: kTB7cM73P9h5jqKaR9YGbwVTQwji2+xZXBGT2FJE8I8Ox6V09qZ1W0fqCU0ax8qp0sCNCd/aXZ64mGZHFKS8kQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8633

From: Peng Fan <peng.fan@nxp.com>

Use scope based of_node_put() cleanup to simplify code.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/pinctrl/nxp/pinctrl-s32cc.c | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/drivers/pinctrl/nxp/pinctrl-s32cc.c b/drivers/pinctrl/nxp/pinctrl-s32cc.c
index f0cad2c501f7..df3e5d82da4b 100644
--- a/drivers/pinctrl/nxp/pinctrl-s32cc.c
+++ b/drivers/pinctrl/nxp/pinctrl-s32cc.c
@@ -268,28 +268,23 @@ static int s32_dt_node_to_map(struct pinctrl_dev *pctldev,
 			      unsigned int *num_maps)
 {
 	unsigned int reserved_maps;
-	struct device_node *np;
-	int ret = 0;
+	int ret;
 
 	reserved_maps = 0;
 	*map = NULL;
 	*num_maps = 0;
 
-	for_each_available_child_of_node(np_config, np) {
+	for_each_available_child_of_node_scoped(np_config, np) {
 		ret = s32_dt_group_node_to_map(pctldev, np, map,
 					       &reserved_maps, num_maps,
 					       np_config->name);
 		if (ret < 0) {
-			of_node_put(np);
-			break;
+			pinctrl_utils_free_map(pctldev, *map, *num_maps);
+			return ret;
 		}
 	}
 
-	if (ret)
-		pinctrl_utils_free_map(pctldev, *map, *num_maps);
-
-	return ret;
-
+	return 0;
 }
 
 static const struct pinctrl_ops s32_pctrl_ops = {
@@ -786,7 +781,6 @@ static int s32_pinctrl_parse_functions(struct device_node *np,
 					struct s32_pinctrl_soc_info *info,
 					u32 index)
 {
-	struct device_node *child;
 	struct pinfunction *func;
 	struct s32_pin_group *grp;
 	const char **groups;
@@ -810,14 +804,12 @@ static int s32_pinctrl_parse_functions(struct device_node *np,
 	if (!groups)
 		return -ENOMEM;
 
-	for_each_child_of_node(np, child) {
+	for_each_child_of_node_scoped(np, child) {
 		groups[i] = child->name;
 		grp = &info->groups[info->grp_index++];
 		ret = s32_pinctrl_parse_groups(child, grp, info);
-		if (ret) {
-			of_node_put(child);
+		if (ret)
 			return ret;
-		}
 		i++;
 	}
 
@@ -831,7 +823,6 @@ static int s32_pinctrl_probe_dt(struct platform_device *pdev,
 {
 	struct s32_pinctrl_soc_info *info = ipctl->info;
 	struct device_node *np = pdev->dev.of_node;
-	struct device_node *child;
 	struct resource *res;
 	struct regmap *map;
 	void __iomem *base;
@@ -889,7 +880,7 @@ static int s32_pinctrl_probe_dt(struct platform_device *pdev,
 		return -ENOMEM;
 
 	info->ngroups = 0;
-	for_each_child_of_node(np, child)
+	for_each_child_of_node_scoped(np, child)
 		info->ngroups += of_get_child_count(child);
 
 	info->groups = devm_kcalloc(&pdev->dev, info->ngroups,
@@ -898,12 +889,10 @@ static int s32_pinctrl_probe_dt(struct platform_device *pdev,
 		return -ENOMEM;
 
 	i = 0;
-	for_each_child_of_node(np, child) {
+	for_each_child_of_node_scoped(np, child) {
 		ret = s32_pinctrl_parse_functions(child, info, i++);
-		if (ret) {
-			of_node_put(child);
+		if (ret)
 			return ret;
-		}
 	}
 
 	return 0;

-- 
2.37.1