Received-SPF: pass (google.com: domain of linux-kernel+bounces-165275-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Date: Wed, 01 May 2024 20:56:05 +0800
Subject: [PATCH 07/21] pinctrl: spear: Use scope based of_node_put()
 cleanups
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240501-pinctrl-cleanup-v1-7-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: 1e665480-5eb4-4375-39ec-08dc69dd3f8a
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?QlNOQXFjcEQwMjFyVG00L1BHYUVhTWE3YnVvVlVoazYrc3crdjhDZFBicW5E?=
 =?utf-8?B?N3lxODRkNTU3S3dubk1YdXhpV0VvTkw2aHZFck9LWGUvc1ZrU3dJZCtxQ3Vx?=
 =?utf-8?B?N095V0YwYmxZTHh4L1gxYWNpWkpqWjlGTzh0bDlvRUM1QUlyY1Q2c2VheGhH?=
 =?utf-8?B?ZnBpRDd6TkJjS2xVY0tkN1pKWWhzWTIxVXBJY1BlK0psRGpUZ2l0OG1VV002?=
 =?utf-8?B?YzdNemRRcWJSc0gvZnVwWmhYLytwK3BIYm1uQUNZT2JUc1ZpbEZKRndRQ3A4?=
 =?utf-8?B?M2NMMTUxdUxEVm1MQ0R1M2lQaDNlYlUxK250aEtuRmJMSHZrS3c2RW1jVkor?=
 =?utf-8?B?YnFsTXMyeUZ6WFRwSnVBaEp4YVV2ZzJWNG5nK2JrNUhhakhXUHVCUEd5dU13?=
 =?utf-8?B?RUFBTVJtT29lclZPSHNoVS9BNG9raVZEcDYwR1dXM3lYUldwbUs1SUhoeGdQ?=
 =?utf-8?B?d254a2RSdm5ZeWZ5MERteHlJNHlLc1NRQjQ4OW12K282UzhTLzVaTHg2YXVa?=
 =?utf-8?B?clBwdGw0N3JtNVBuNHBYVitqQWN2UW9aS3k2Uy9TeE1wRmRoa1g4a0JJcTQ0?=
 =?utf-8?B?NHpYQWFTWkx6SnNrdkhLTjBCbjZlcFFuTko2Wk1MdDgrZ3h5NEZJelR6Uys2?=
 =?utf-8?B?Q2VuUkI1UjAvd1NCellrbm9xQmx5emxzZXR5UjdxQ3JtcTVhaUpvRmpsOUVt?=
 =?utf-8?B?YldiNFdMRVFkZkcwMDdYMXhWQm9HaXdlT3EzNGFaQVp0NDI2bmdQTko5OVRZ?=
 =?utf-8?B?THU3OG1MVVpWeWhETDFNYloxZTlxU2FLTlkvMm5YVGVlR0R6aXp5UW9qMDdI?=
 =?utf-8?B?M3pHb0ZkT0FrZmVHaGVQQVl4Q1U1dDdOTkhDb1BNek90M2lPRlM3WlpVR2Rk?=
 =?utf-8?B?WTBoeFJ0TWpVSXZ4U1RROTNzUTltc3pzZ2t5c21hcVg5ZENKSWtCVS9JOUJ0?=
 =?utf-8?B?QzF3WlUwSHdTTTVsZG9kNFFERDBKNVlkTGtuZkFoYis2UWk0RndybU5VTk1X?=
 =?utf-8?B?NWY2dzF4VmpQNGdIdEZOUGk3QnBzVlFQTno4QzhpKzFSSE15c21qdGhGTjNP?=
 =?utf-8?B?TU9tQm5ZOUU1RmduWEQ5OVA2MElUbHpEYVFCY25WcEtFUVhWQVZ6bGxzZkFv?=
 =?utf-8?B?eWoxWWxCVXBMaGUwOWJmZklVL2VvZTVnU0lPbmRiYW5BeXg3OXBldGNjYTRo?=
 =?utf-8?B?alkzRStyWTRZMHk1bkhxL2JiQ0xSUm1sbEF1SWVYNzFxc2k4ZVJCZzlwdmlD?=
 =?utf-8?B?cU5zdnU4cy9CdGdXWVROYXVGamV2UncvV3Rob1NBTzU2Y0hnU0M4aVZVSHd5?=
 =?utf-8?B?QVBPdmZ3SEpXNWZjdGJ0aXpNUjY4Tkppc2t1M2V5MTRQK1had2pBZkpjaTdl?=
 =?utf-8?B?WDZVVnc2biszZk5OaGpCMktvQXh4dDlqVzVJNFFYVUIxTmtVbFhuOVhacXZl?=
 =?utf-8?B?aEY3MmcvanJJRkdSSmJIb0hWRGQwdHRvYWNxRFpuK1dQcFZtZUd1ZzFFLy9p?=
 =?utf-8?B?eTBBVlQ2WEtBSkw5TWI2ZlZaN05WbkM2SXhocFl6ZjZYeHMyTiszTU1yenZJ?=
 =?utf-8?B?WHBQSnNnSGh2bmswaElKYVpJMnp5OUVUYUFMaVdQY3o1WTJ6RHI4UFFtVFdV?=
 =?utf-8?B?N294b1NDNkxsdk53cnpqUy84S3doMDNtWjBQQ1VKWWJKdGMrMitwWnNCbk1p?=
 =?utf-8?B?U29EaTBaclRrR3JBSk1hSDJvZDdCb1pCaHV3bEdzb1IxVjJSak93bEN1Yi8y?=
 =?utf-8?B?QWFvd3RDd2tmWHc0VVdoY2dMWnlKYmc0UUlScUxZRmdTa3I4V21ISStHZVR4?=
 =?utf-8?Q?wTWF9BAO6Po5NhzSvLXEmBrfBzrm9SfRpzSHA=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?aXBSczkvZ3BJM3NCaHhPTEhKZU42V0llempCdlZxTDJWcFIraERvV2p5bFVn?=
 =?utf-8?B?a1ZIMURDK0VoVDJ4b0IrWjgzS3I3L0tBUmtvQ2hCZnlHcVZ5SXVFaDFsazVt?=
 =?utf-8?B?ek9ZMGZzeC83dlRZUTJiV2ovWGV2Q1JQZVkxajlBby9RL3RaUUE2NjAwSGNN?=
 =?utf-8?B?Rndwd0VqZmkzenlwN3VzOXE5MWZJTjNHemVyUHFUeUZxMUsyWmNaRklzMm01?=
 =?utf-8?B?K3ZEaHdjR0VNYXdUTUcxR2dpUTFQb3U3OURHV1Y3QzAyYXQyYnovVy9iV2RN?=
 =?utf-8?B?NDZKSkxJVGtjN09QckgrblY2eFBHL0FpM3M2WWxaTjdOMHN2Y2F4ZWZnQWtK?=
 =?utf-8?B?dkVqV0E5NnRvSHNRR3J1eWJDWitscU85QVlFM0JhbUoxWHJBams1d2I4YXFy?=
 =?utf-8?B?TlhCeGRJYkFOV01IZzZXUUZJR2hCZmhSMXVzZ0pPcVZJVllPdFlKRUhiSEJQ?=
 =?utf-8?B?WmVQU1RUQk10Rms5blUvTzJmdnM4MkF6SEErajhkYWYvaVZyQU9qd3ZGbmtG?=
 =?utf-8?B?ZmdXYWxvd01lT00rdC85engxeE1hNnRrVlRXWHYyM0JQaHBOb2xvNXNSOFE2?=
 =?utf-8?B?dmVYaHJyOCtlT3ladmJxUmNFeTZRUkZWUHdqbk1KaTFaMlNLcXhKanowTkxC?=
 =?utf-8?B?WHhHUzdRQXp0OU5XUkFuZlhuMVdpbUJLdDZzYkJFdWk3QVpyQXVDRU5aVk0y?=
 =?utf-8?B?UVpnVUNDUHlmQlpvNzFRQy91YUhPWlhNQmRMRXZFL3lPLzlSVjNDUElsVVZW?=
 =?utf-8?B?U3h1UWpKNG1QV0p5UWFOcXF4SlpJYWNpTXVZTHB1YnU2VHlkTVhTcUtuTjBW?=
 =?utf-8?B?UFNLaU9FVTBKcVg4U3k3aHhEZEkxbll6M1NHcjJwWlArL2daK1oxNUNJS1Bv?=
 =?utf-8?B?MGFzOHlpSU53a0d5UHZZU0JuQ3hIc1d3Wk1FdEh2b0ZxZEtTbFc2clQ4YkZx?=
 =?utf-8?B?QjVFZDFiZmREL1VXalBnckJNdENDYmVwZS9ZQUNiUGxCQTJCQUJETTh0ZXJD?=
 =?utf-8?B?MVQxejBKOFFBRUlMWmw3WkV4RllCYWRLY0pyU2tBa1hvRGhBNjdXK2VuWnNs?=
 =?utf-8?B?WnRORXJoeVFlK0pJVC9aYmpvZENtd2Y5MThVWEc1R3JxbjIwcWJDSXN3NlN5?=
 =?utf-8?B?d0xTazZPUEo4b3poNGRYYmJaa2hqd1JvWXh1NmV1QkY0d3NMZVFjM2FsRGMy?=
 =?utf-8?B?WmZYeDM5czdBNFhSR2dGRTlHRnk2ZzB2THo4Qjk4TUpMUGlJM2h2amg1NlBk?=
 =?utf-8?B?SDRSL2F6WnJCSzJVa2dleWt6aXc4YWRCZzJRc051ZjRzdUxERTNYYldUSWFi?=
 =?utf-8?B?cXU1L1VwYzJ4a3pKcHRsMUttSUpwVlExVU9YQ2FnZlhaSVpZVlFYaHI1MXl4?=
 =?utf-8?B?bVJ6Z04wU0IwMUpzMDhtQkF6bjBDNG1yYUQ5eXliYXg3ZE54eGxUWWFtTFRS?=
 =?utf-8?B?U3FHT0dqb0tXdDJzU0svb3dTVmZXSE1ONjgzZDBUNDZPQThYcXQrL3hIbWlG?=
 =?utf-8?B?WnU2Nm04T0ZIREtBVnFDNUNMd2JEWWFxOGkyc21xZllBYW9QSmxHLy9IeFRl?=
 =?utf-8?B?WXQ1cE1IaHNKKzc5NFF4QTZTZkpNL3ovN0Z6NDIvMDdoc21GZndsVlpMRHJV?=
 =?utf-8?B?ZFJmZ2lXSmtINnpIOEtuNUFrSkpzR1ZKMFQ4emNSQmxVN1R5aHcvSnJHeHgz?=
 =?utf-8?B?WDdMT3F4YS9nSE9OeVZYZmJKTFpzcmVwMmZaN3F4dW5YUVI0MFRhZElHdVg3?=
 =?utf-8?B?c24yS3VaODRPOFEraUdWZGovRDlSbGF6MitVMnZMRzBuMHAyc3JLTWM3eDhD?=
 =?utf-8?B?UWk0T1llME1QeDVhRnB1VTNUYTJGdmhVWGRoNUp6d1hqOVNZazkyRmZHM0gw?=
 =?utf-8?B?bnhDRzZzcUVSOGpWTEFBWnlaZzUrU0lhT08vVmQyOE5TVGlZVVRxb2lQTHhk?=
 =?utf-8?B?R3dHQW9vSVh4NWx2Z3JTekFkTlBoayttQk0ya3J4OVlwQ0FMWHc4RW1QLzNy?=
 =?utf-8?B?QnhYU3lGY2g3cHd1eU1BRzA1VVBwVEx6M25kb2w3bDlIck1tMVoydnZScXZE?=
 =?utf-8?B?QnRoVGU1a2x0alNROVJvM2NYYkpoTnBqV1h1YXM1ZXVUblp4Z3FpVElwdzRW?=
 =?utf-8?Q?VWDDTs7drznjxRKvCb1Hj8ylC?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1e665480-5eb4-4375-39ec-08dc69dd3f8a
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:50:15.5502
 (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: XkHfKCLsyqDxegbPuqxBxgVbu73I8PVYwC7CDQNooBActqbhc11Njlm8wnVrI5roh5OyAWqtvP41o5HfZmQ6aA==
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/spear/pinctrl-spear.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/pinctrl/spear/pinctrl-spear.c b/drivers/pinctrl/spear/pinctrl-spear.c
index b8caaa5a2d4e..a8c5fe973cd4 100644
--- a/drivers/pinctrl/spear/pinctrl-spear.c
+++ b/drivers/pinctrl/spear/pinctrl-spear.c
@@ -151,24 +151,19 @@ static int spear_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
 					unsigned *num_maps)
 {
 	struct spear_pmx *pmx = pinctrl_dev_get_drvdata(pctldev);
-	struct device_node *np;
 	struct property *prop;
 	const char *function, *group;
 	int ret, index = 0, count = 0;
 
 	/* calculate number of maps required */
-	for_each_child_of_node(np_config, np) {
+	for_each_child_of_node_scoped(np_config, np) {
 		ret = of_property_read_string(np, "st,function", &function);
-		if (ret < 0) {
-			of_node_put(np);
+		if (ret < 0)
 			return ret;
-		}
 
 		ret = of_property_count_strings(np, "st,pins");
-		if (ret < 0) {
-			of_node_put(np);
+		if (ret < 0)
 			return ret;
-		}
 
 		count += ret;
 	}
@@ -182,7 +177,7 @@ static int spear_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev,
 	if (!*map)
 		return -ENOMEM;
 
-	for_each_child_of_node(np_config, np) {
+	for_each_child_of_node_scoped(np_config, np) {
 		of_property_read_string(np, "st,function", &function);
 		of_property_for_each_string(np, "st,pins", prop, group) {
 			(*map)[index].type = PIN_MAP_TYPE_MUX_GROUP;

-- 
2.37.1