Received-SPF: pass (google.com: domain of linux-kernel+bounces-165285-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Date: Wed, 01 May 2024 20:56:13 +0800
Subject: [PATCH 15/21] pinctrl: s32cc: Use scope based of_node_put()
 cleanups
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240501-pinctrl-cleanup-v1-15-797ceca46e5c@nxp.com>
References: <20240501-pinctrl-cleanup-v1-0-797ceca46e5c@nxp.com>
In-Reply-To: <20240501-pinctrl-cleanup-v1-0-797ceca46e5c@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>
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_|DBAPR04MB7448:EE_
X-MS-Office365-Filtering-Correlation-Id: a105c504-f42e-4153-e745-08dc69dd8c91
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|1800799015|376005|7416005|52116005|366007|921011|38350700005;
X-Microsoft-Antispam-Message-Info:
	=?utf-8?B?TEVsQi9GUFBaOVhlL2JweUwrZXdzTGRvbHBCRlZDaVJXTzRDU2E2SjRDQ3lW?=
 =?utf-8?B?QXpWMWZGbDYvalNjd21uY1FVK2I4ZURCSWRMazJyTHVHS3BBM01hNlR1UUtW?=
 =?utf-8?B?eVZST1lqVVg2TWo2LzJwUXN1QWpBY2RrL21tYjF0dy9qb3Q5NUhMRHpLRm1q?=
 =?utf-8?B?M1FVMGdXTk1ScE1HaUx4ekRidHpIbWFha1h5bGVFT2FDdUJSU0dlOFMzSi9n?=
 =?utf-8?B?LzVoQUlLL2JzVVBXNzFnWjYraXB4anRBUS95aVlxd0JSUGNqeEJFZWxEUjYw?=
 =?utf-8?B?dXAwam9wQmNScWNHT3pkWnFYN1ZIRmQ0VWRuL3JkbXlwQlpiZUFBNEVmQkg1?=
 =?utf-8?B?Rk4yM2svbFMyVXZ2SitEaHlZdXdxcnVMNzZ6a1FESXdkbzBrcVR5VWpjTmhT?=
 =?utf-8?B?UFZueFlmampMblhNQmRKRzBsUmVsSjlIdDJsdlY3dUFSdyt5VExwSDAxOSsv?=
 =?utf-8?B?eFlDdG43LzdENk9aakgxWHdNUXoyZkZsSUQvampHY21PK2VFak1ncDdVUmp3?=
 =?utf-8?B?Z3c1M2RzRTVlLzZwblcyQVJFdlNIdklnOGdXMFAya0FwUE1UeHNwZ1J5akJR?=
 =?utf-8?B?RFFTdVFBMGFlQnhHQjJlZVlRNWtSbmZSaXJQNnE5dGNmYUFLc0xPZkdOYitI?=
 =?utf-8?B?bUdDdWhCZ2F5NkZvVkpVVVpNQ3hKaTBLb2pXdDZJWGVRUXpyS1U2NE9lYWZ2?=
 =?utf-8?B?YUZMVjNiTGpSenA1Y1VEUDZSTkprOVhHZ3dpTFRhUjJDVzB4MWtUanRtNEM2?=
 =?utf-8?B?Q1k4R2ZNbU9jcE1oV1NBbHJOclRCZmw3NEVkR1hGV0ZtSWVrVjRsWUZuLzQ0?=
 =?utf-8?B?dXRMbGdUT0dmOWlHTUVPQ3FtK0xnVDBPRWdXUXpDK0cvRHd3U09lMWxMcFVh?=
 =?utf-8?B?czRVN3RPTThzdDJpQUpEZVVET1RBVjc5d25QOG5JcHpJVTZUYW1Ud3RTelNt?=
 =?utf-8?B?TTB5N2MvMytyU1Vad1d3dzRramxxSXlmODJHQVppY21qMEdZV1V1V1FiVjJJ?=
 =?utf-8?B?MDNPeTg4YjVpSVdWTWpuTXIyYW9oTjVGUzRPQXR3RFN5WkMvTE5FZFpNNlUr?=
 =?utf-8?B?aTBSTVlEU2lGNTkxRU81SmhpaTEyM2l1RG1YeWRZQWpEYnpnZmNJZ0MxVGFM?=
 =?utf-8?B?by9NbFBoQTUwVHZHRFJsUXRrUVFyZUtwdkc2NUNFbjhBRXZ5TVhrRjdwcGpy?=
 =?utf-8?B?MmY3Rm5kMzhDV3lUVVliMnZMQnI4LzBrcjJPWHY2dWczZFN3L3hSTUo3VElY?=
 =?utf-8?B?UDdsWWF4dFduanJHc1Z3VFBoS2o2ZFRKa3BtYksyTURHbDdwYUVjSlhFQWxq?=
 =?utf-8?B?am5QVE5PeFVnTyt4R1VTMVNibzhWVVZ6ZHRVSXhNWDl3V3BCdkQ0U3ZYOFhS?=
 =?utf-8?B?aFdHNHk2cGtHOEV1M1V2R3lGWHBHQk5sdHd3cDFPS0RBZWtucStQcmZlSytR?=
 =?utf-8?B?REhIK0xUTlhRN3dNUTFKck1nTk55dXFtWU5GN0R4NFBoOUlMckhxYm9jSWw5?=
 =?utf-8?B?Z05tZnZiMkRJR2s1Q00yOXhDRk12SWpmTGlBQW9ha1JRRWlnOEpkejFuSGR1?=
 =?utf-8?B?QmhFMU9FY3U1OTliYzdrUFhaRS9NZGREVlBlY0JUNzFuUVNZdFJ5MzJvdVpU?=
 =?utf-8?B?MlpQZWdJcC9ta01INCtZNzEwaWhPRFM4NUJ2TGJCZ3E0alNFYzJnSkFDMnI4?=
 =?utf-8?B?NkNzbS9EejQvS3liZlNrNTRSMFZsOVZPaE9sa3FQaG4yWDlpSDA5K25RT1RH?=
 =?utf-8?B?N2hlU2NaMnkzcHQ2T2c0VkZ2UWFGcFRXYmNtWktBN1lXdi92RVNlYU1CUURT?=
 =?utf-8?Q?Ds/0XWpe8qkZXxM4dmReSEZEojKxrEaZOMa3U=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)(1800799015)(376005)(7416005)(52116005)(366007)(921011)(38350700005);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?RmpwQjVtYnphMDJpMlQ3YW1RVFhOWmpISjNhQmVWZVdZK1Q5cWc2R2JqdG53?=
 =?utf-8?B?NG1mVWhiMWRTZjhIQVFvaTRqNDdsWno2RVJaSnFrK3F6TXRPZ3RxdWRlY0Rx?=
 =?utf-8?B?eExFeDgvR0gwTzNYNXMxVFh4UzhvYnNpTzdXQVc2WUtHVVlFR1hITy9UR013?=
 =?utf-8?B?N2p6WWtHNS9WOW9aTHplNTNIL2EvUmpJbTRqSnp4ekVkNFo5eDJYZVVrQU5o?=
 =?utf-8?B?eUprVFRYZXdOVm56QitUZHhKNXMzRnFSYUg3SU5adnlENWkvb05DdE1FK1l5?=
 =?utf-8?B?MkpoRFNWRGRIK0V1R3RBelNNN2lCdU9YKzlWWHFQY1pacXBhNU1QRjRQNFd2?=
 =?utf-8?B?ZlZKT3M3ZWlEVXFQNVFjcFpQbXRtNXU5VDVhUWlQS25SNHQ4aFprbGxwVVJE?=
 =?utf-8?B?Nkd0dU8yTFhRL28wQnRLM1MzRVMwa3hHZWNIcVBPSEkxS1JRUlpld2xsZGxV?=
 =?utf-8?B?Z3E4SUVMS3gwc2xoT3ZDV050ZU5pVXZqWFdoMTlDay9jUStyZnB3VTR6SWVB?=
 =?utf-8?B?ZDhWcThnVXhwVDhubUllSWNaMjI5SjQ3cDNyT2hDS0lkaXZrck5xbk9Wamdx?=
 =?utf-8?B?eWdDNmVObkQxaXAwOFlpeDR0bWl6eVd1bmU2SWpQbFJJNkhGRnF6VHMrZUJU?=
 =?utf-8?B?ZVNsTC9INWoyTEpTL25aTmdwR2tqUHVzVlhrVVhuM1REM3FqK1FzUkVaOUg3?=
 =?utf-8?B?SkhCZk5ya0U2Z3lLYjNQUy91WXV5TURmVENJS1Mvd2NpaXhCcXI0MXVKQjY1?=
 =?utf-8?B?MVBveXJHeU1aVEl4V016dkh2ODRmM3JTSmlqTUQyQW4vZ1RLY01pVTB1R0Rq?=
 =?utf-8?B?Mk9BYWxQaWRoR2RzbXAxbkZkV2VKamZpQ0oyNHVnQmxTeE5BRTBlb0x1NTA3?=
 =?utf-8?B?cUxiMURlZHlBOTgwU3RqeVBpdlN6cmtJZTRmeUJxeHp3NmZaZEordTU5aXRm?=
 =?utf-8?B?SGlzc1NHTUU3MU5EdVVGMTlyZ294L3hsK24xTHlOU3RyYTJxdEVDOXVFSmtU?=
 =?utf-8?B?T3Jod0VsYzdVKy82T2srNHNETUhJSmMxbDI5RmpGdlpIN1dRRXdEWnNScFQ1?=
 =?utf-8?B?L2V0V0k2eVNxVnhIenNyZzI4elIxbTFIUGhkUFp6OUllT3lUTGhURE03QTQx?=
 =?utf-8?B?NzdMVzdRTGlHaW92UDcxRUN4bTFuSFZleUhzZDFuRGJXVDdFbEtFOTBzT0tW?=
 =?utf-8?B?TmRhNGNTMjgrNEU0VjNmcHUzb0dtZXJWQUt5eWk2UWhnYWw4MkNZNWJUaGRv?=
 =?utf-8?B?czhtNzR2UUFHZ3dTZi9IRHhxZndSRm5Ed29YZVRyZDJDZ1lDTGJBMTRxM1hV?=
 =?utf-8?B?a0s0ZkpMcmZ2c2VrcTFTM1h6Nk1Oc0JjT1BQc2hsL0h5R2NVMUI2M3pCUy83?=
 =?utf-8?B?dFl2d2JMbzlOL2NNRFZaZDhmVkdibFhUaU1OdlFUQ29qeGdkU2Vhb1ZvQVVI?=
 =?utf-8?B?WXg1b01RK2tuMmNnVjV4Z245KzB2QmdHK04xQUwzMmFFdElRZDlXR0EvUEJy?=
 =?utf-8?B?RnhrOW82dEZvL3l5ZTc5bDdaKzhNKzdsVm42VEZZdlBKOHRHVG5XR1hJRlBq?=
 =?utf-8?B?Mk9pSXd2bnZ1aitpNnFiTVQxcThwZUZ6M1hyYnRBYnJud2t4bk9KUlZVT3Ni?=
 =?utf-8?B?bnJWelhSSjh3M05DZnhYUk1FNEpPSngrS2JraFdxN3ptNldCbEhmU0lZNm1y?=
 =?utf-8?B?bjNyZGM4NDJDemtYWGRPR1lJbGNabHBoNXpEM1QrQ0M5SzNLVE05TmxObXRz?=
 =?utf-8?B?VlVtMEVjell5UUMrYzdnZ0NublVKMEZwMmpjNXplNk9sMDhJU0tqcnM2cG9h?=
 =?utf-8?B?eDMveXlmNTFvbE5jV1RvNy82QzVoM1hlS09meGdTN0R5eVcvY2NkRFhhUnF0?=
 =?utf-8?B?NUtIMkdhUzU3UHlydkxxVkN6aitXRytQcUdtckZmakhwbE1tV2N2VDYrcjNk?=
 =?utf-8?B?czVUM1hrdlhxMml3LzdVNWRZSmQwcWRSQ05lYzg0ZHRGMDZ4TzN6SUV1eHFZ?=
 =?utf-8?B?SThqTkNic1kyQ3pTUGpOZEdWNjNmeUxPRTdmSE44eVdWZjJ0KzViTS9oNFRj?=
 =?utf-8?B?UzhlUUl4SkxxeDErNDQ4Q3VBVDRHejIzMkFIbHF4RlFWb3RFMGFJRjQwSVpk?=
 =?utf-8?Q?QG3EVCCc9v+ORrmYmPksMogL/?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a105c504-f42e-4153-e745-08dc69dd8c91
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2024 12:52:24.8089
 (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: CZStkNJGrOCQR6h70iowtdqpuRv0/HE6bewRFs5vat2TN7ogu87qOKaglGCwTHgwSua78d9w2wAeVmvCLtq+CQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7448

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