Received-SPF: pass (google.com: domain of linux-kernel+bounces-165273-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Date: Wed, 01 May 2024 20:56:03 +0800
Subject: [PATCH 05/21] pinctrl: starfive: Use scope based of_node_put()
 cleanups
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240501-pinctrl-cleanup-v1-5-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: a0db37d7-54bf-423e-011b-08dc69dd2c5c
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?b1VDZW5sYlpQUGRDc3VTMFRDNFhzZWNLZExTcnE4VUlDS0ZNWFJPS09vRlha?=
 =?utf-8?B?bVFOT0h5bkxmWEF3WTRwK01wR1pGVkZvcjJ5Q29zNHpjT2hxZzgrUE1lb1c2?=
 =?utf-8?B?WDRnenQrWVIyR1g1c0JFUjBiRkFWM3FOaVRLVzAvOWlZREtIRFVJakorTDFJ?=
 =?utf-8?B?Ritta0RGZnBkQ1BsdkJ6TEFTRXlCR2hlZEJxS1BMWFJ0VGo1R0Y3MGs1b0RP?=
 =?utf-8?B?bHBsRldoL1VkT1V4VGFOOVZqbCtwMnZIRUZ2KzJqZGlKV3Zad3VIQlFONEpR?=
 =?utf-8?B?Um4rSHFUZFZCVUF0V2wxbFluUVFDZFVUL0FVVW5ZL25UL1JHZ1hueHdNRXBx?=
 =?utf-8?B?Q1VleEZYTVdKaHVKSE1XWStEa1huZXV6NlBxanBPK295NzFUZEZJVGhVZlNh?=
 =?utf-8?B?d0dmbFVMb1R3VzAyNlduNFd2VlkrYmpaTWhXYzc1bW92ZzZlT1kwdzBYNUla?=
 =?utf-8?B?Y2N3MkswYkVqeFZMVHY3SnlvQUpFeGpmYlNwbUVEUVN5UVJpYlBHWndUQjcx?=
 =?utf-8?B?MGt4bEtUNlJvRjdqQWRSZURIcXl1Q1N5aE5ITHpHZk4xT1hiSWZFSmlkL3VQ?=
 =?utf-8?B?cTF6VDlIUi9IdXk2cFo0c1o2NmxCUGtDc0FqdnRGbjgwMzlhZkpFZXZkNVJz?=
 =?utf-8?B?ZjNoWmVGeVNHU0lmcmhHY3gvdk9JdG5WQkozUGhxREEzYVIwNm8xUGF3QTVl?=
 =?utf-8?B?SXcxTWtqakwxMWtYNGZBamhuK1VvbTlxSTlvZXY2R0VtNCtOVHVacFJlUkhU?=
 =?utf-8?B?dVpKMUF1d0VWNjJjTDczdld1dlNRTzlqd1ZUc0NtbDdDeHQrS1VzTEJIMGFO?=
 =?utf-8?B?UzdKK0NPV0tVTDUxY0t0ejUzT1hxTktTbkFkRzRrdmdrMEp4ZUpIVUtZYkN3?=
 =?utf-8?B?VDNMQ1NCaUFLc0tPYzJUT1NNRXU3OWhKWndtdWNYSzgwRlFKQTBWanpSVVZu?=
 =?utf-8?B?SDVtOGhIdS9jaEVsVW1PYUxhTzlkeE16TTlXK2hsN001SDJRUU9FdkZ1SlZX?=
 =?utf-8?B?dFRjM3IwV0JRbUF5SENDbnkwZTAxQk1nM2pUa0JwanRMS1VWUzlERDI4YSth?=
 =?utf-8?B?OEV6QnR0OTk2c3JlQlAwanFmYm1BcU53cTlKSXptNERuSGZkaWk4ZlEwRzRs?=
 =?utf-8?B?WVk5a1MydWRGdlEraXdKK3lqdGoxMEhiWk1QSzA4VHBhTDd5UEd5TTRVa3kw?=
 =?utf-8?B?aFJyNStzNjBkVXdjVFZtZVdGVmtWSE1uQ1E5U2YrUlc3bi91SmQxbStyUXdP?=
 =?utf-8?B?RHdYeFlzR1JYbGZIVGthaTNGYys3OFF0VzlxTDhSdlJMZjhGN1IrN1I5WGU5?=
 =?utf-8?B?cUZxWHZBWmlTZHdxTlVrb0xCbElMY2FzcTJCc2xnOGZXTGNEcG9YbmwvL0g4?=
 =?utf-8?B?c1ljdEtqQlM4eTFQUGdmb2lTWjc3UGlyZW44UkpHUXRTMVgxc2RxeWNhc0Zu?=
 =?utf-8?B?em5RMmk3d3VyMkdxdU8wa2I0UTVEU2FIdTJjZWVPRVo3Y05TWjFacVdCQWVE?=
 =?utf-8?B?RTZyZi80cU1SUnY2RWE5TTlkVWl2Y1k0MnZjRmREd3dvak1weTFEMU5ybkpR?=
 =?utf-8?B?b2ZVeXpRWFRMakE1bkZ4Ylg4YXQ4OXo1R3l6bkVlOG1EWnFDek91ZUh1RDZR?=
 =?utf-8?B?UEV3ZUpVVXRmT3ROVklEQnhJUC9tTTRUd2tzU1dubE91WVd5NVlJK0tyMTBZ?=
 =?utf-8?B?T2luQlh3WWhLWnFkRlFYVVdHNnhGQTdqNGJmMzdBS2NvUEErMFh0RjZqR3JC?=
 =?utf-8?B?bGdRcmpwcGRMamJHUUZtWU9kak50djdOYUpOWUdHYWh0ZjNZUFB2ZGtDaERW?=
 =?utf-8?Q?bwWprVTIWVciAvdMeLsq30xVPquA+1HH1LP6o=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?anR6Vkw2WklJcEpLTVhadzhmOEZaS2ZseUJUd08vZWFPcXRGbTllb3ZxOGV4?=
 =?utf-8?B?SUovUWczU2dYb1VHMGJqV0dhenVGc1cvT3hBYWFwQmRYbXRrNzFjcDNnZUJV?=
 =?utf-8?B?NVJFQk01bncwS1lpRmd1Vzg3ZG5CVW9VV2hJQVl2bDd3blh6TzQxU2FRb2Ny?=
 =?utf-8?B?V0VjeUY0MnVhaHBMbjJGdUNITXY1clYra3NHV090Tk9PQ1hyNjhnanNGTSsw?=
 =?utf-8?B?YndESTE1elEzc0ZtVDUwZ2Q4NVVaMlZ0WTRkOFJTMXczVksxdVUxTVVtMldo?=
 =?utf-8?B?SFhuRnBaNWk3OEgrRnR6anBEZDlRZERsd1VVME9ZRm92bTRYbDRiYStPaDNN?=
 =?utf-8?B?UThSWTlLaUUzTGxndUo4ampvQ21KNFdYM1FOeWJQTDduOWNQc3Z1N3dORnRW?=
 =?utf-8?B?c2diVWdFVTNzcUdHcDIwZWd3TXl0cVNnL3NYZlFYcFVYTUVmNm5JMDRGYVpp?=
 =?utf-8?B?b1R4clZkdkVpNC8wZlNkSjZVeXlwalV3cWF1UDMvRmJHRklLZVAyaCs4aWN1?=
 =?utf-8?B?VTRLUHAxeVI1UDVtRGFqQUY2NVlTakRlbXNjamZMOVZmN1htZzBJQ3dNd3RQ?=
 =?utf-8?B?L2NzOGM5MUV6dDk2VWJkMUZZdGdKYmZISVdKbU5JZTBDUDdPbk1ZSzZDTWw2?=
 =?utf-8?B?ejBVV1hmMXlwZGpYME8wUjExeVJrNVpRcnVyeHlmZ1QwNXorOW1hZnFnS3Zy?=
 =?utf-8?B?TERoVytUQ1k5bkEyT21SSEdPSkdMeWZyM09MVnFJT2Z0WThtcllGMG1SSDFU?=
 =?utf-8?B?QUl5QU1NSU8rb2hRenZhSktmY0JMdVB2c0V4WHNZekpjby95YlVOTzlNRWx6?=
 =?utf-8?B?Uy9Kc1hWK0dPNlY3WjFoczl4dWNZNFkrZ1EvVGZKekwrUDJtdm1qYmg1YXh1?=
 =?utf-8?B?WThtQ0NFeGw5bmxiOU5ueE9HT3lXYkdoZkxqVENFb016TlQ5dmcrZEVCMk1y?=
 =?utf-8?B?YnFYSmxFN3ZrWHpNWnFlVEdjUlp4YzJ5UXZQQ0hWY3Z4M3dVVVNQMU5pUnJ1?=
 =?utf-8?B?aC8zbGIwUFdEQzZBUXVIN2NGZklQa0hQQlphMDFXTVpuSFhXS3hwZ1I3TzBD?=
 =?utf-8?B?bENLV2paRkxMbzk0WWtYK3ZtVDRsSHcxOWR3MWRSNVpRdnJiVjVWQUt6NFpS?=
 =?utf-8?B?UmkyYmFCRDNsSnZya09YaFVWdzRheDBMVHovdHg5OTVCWnRrQ0ZRWVBiMUgx?=
 =?utf-8?B?dDVMaStPTVhNUTVqWGwrU29tUHBSV3gwUG1RcDduY0ZzSWlrNmEyT2pJYlhh?=
 =?utf-8?B?MjE4MXY5b3dXWjk2ZGdpS0JDVjRtdHlFY3RlN1FLQnUyVzR3NjVXYzA3aVV5?=
 =?utf-8?B?NW1Pbk0yZnl2bDdSR1dxZlpZcGkrL2xOa1VQSnBQWld5K0c0VHdZMUtFdXZN?=
 =?utf-8?B?ei9PcnJkcUJZSVdtTmVkU1pDNW9KZyszSHY1blRQMzM0QnptTEQzSEUzMEV1?=
 =?utf-8?B?c2tjejlQQUUxdDY2cHF5Rk5zOFZJVEdKM0tiMGpGZnRRVzdKRDZMdGZPUmp5?=
 =?utf-8?B?T3FoVkJhRS9KSzZ5WWFOQUIzWTI4czE1UE1IUVZzVDRzM2I1cDBNVzMvZitS?=
 =?utf-8?B?ck0xK0tHcm5zWnR3a2xaVFk3OU50Z1hmaEpXQmpIb0FxTGNFaHJKQk9uSDRU?=
 =?utf-8?B?MXdJbE9zbnlkTlhKSzFNTEJueHpCVDNza09iWVRwQVg3cG4xSVZRWHBWQkJX?=
 =?utf-8?B?b0k0c3ZpYlVuVWNmaXdEa2JScGt2Njh5azhwblBaZ3lacWpERFIyVVU1eE85?=
 =?utf-8?B?endZdEh2YUIyN0d0Y3gzT0duV1JMQWpZT1BZNXJUTnQyTU51dVluMStZWmJC?=
 =?utf-8?B?UHAwSnRuaDZWREJkY2FURnZWSEZiRnZ0eFdaeDlyZFNvTHFoRGU0UFRpTmRv?=
 =?utf-8?B?SFkwbjNkcmdEMU1tSUF6SE83aFl1RTM1TS9OM3oyVTM5SVVSQWVXemYrb096?=
 =?utf-8?B?SDJ3NThSNy9pcDhWQkpHUkFubDBJQlp5S092MkZzRm03SEt0RDdvaUFRd2dm?=
 =?utf-8?B?ZndMalVyUU5oZ0NKUFNVNnBFc0lkTzVHTXdGbzR6QWdaSVJIM3h4dEZIZ3ov?=
 =?utf-8?B?TUdDK3BCR2RQOGIrY3kzUG44dXFtaVI1VUtpVXFTUGFOUElsMXJmYkhPbHFW?=
 =?utf-8?Q?5bVHTcyqbxmmbCBdje/rEAAlR?=
X-OriginatorOrg: oss.nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a0db37d7-54bf-423e-011b-08dc69dd2c5c
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:49:43.3920
 (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: a8VMXjN5tnTZbVk5RTJATfV4WVyud8UqeKUIyvYzYSsszFnA3M3VjRSQ8h35vE1kbq/I+796vLW9oWOt6tBpLA==
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/starfive/pinctrl-starfive-jh7100.c | 27 +++++++++-------------
 drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 18 +++++++--------
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
index 6df7a310c7ed..27f99183d994 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c
@@ -480,7 +480,6 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
 {
 	struct starfive_pinctrl *sfp = pinctrl_dev_get_drvdata(pctldev);
 	struct device *dev = sfp->gc.parent;
-	struct device_node *child;
 	struct pinctrl_map *map;
 	const char **pgnames;
 	const char *grpname;
@@ -492,20 +491,18 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
 
 	nmaps = 0;
 	ngroups = 0;
-	for_each_available_child_of_node(np, child) {
+	for_each_available_child_of_node_scoped(np, child) {
 		int npinmux = of_property_count_u32_elems(child, "pinmux");
 		int npins   = of_property_count_u32_elems(child, "pins");
 
 		if (npinmux > 0 && npins > 0) {
 			dev_err(dev, "invalid pinctrl group %pOFn.%pOFn: both pinmux and pins set\n",
 				np, child);
-			of_node_put(child);
 			return -EINVAL;
 		}
 		if (npinmux == 0 && npins == 0) {
 			dev_err(dev, "invalid pinctrl group %pOFn.%pOFn: neither pinmux nor pins set\n",
 				np, child);
-			of_node_put(child);
 			return -EINVAL;
 		}
 
@@ -527,14 +524,14 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
 	nmaps = 0;
 	ngroups = 0;
 	mutex_lock(&sfp->mutex);
-	for_each_available_child_of_node(np, child) {
+	for_each_available_child_of_node_scoped(np, child) {
 		int npins;
 		int i;
 
 		grpname = devm_kasprintf(dev, GFP_KERNEL, "%pOFn.%pOFn", np, child);
 		if (!grpname) {
 			ret = -ENOMEM;
-			goto put_child;
+			goto free_map;
 		}
 
 		pgnames[ngroups++] = grpname;
@@ -543,18 +540,18 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
 			pins = devm_kcalloc(dev, npins, sizeof(*pins), GFP_KERNEL);
 			if (!pins) {
 				ret = -ENOMEM;
-				goto put_child;
+				goto free_map;
 			}
 
 			pinmux = devm_kcalloc(dev, npins, sizeof(*pinmux), GFP_KERNEL);
 			if (!pinmux) {
 				ret = -ENOMEM;
-				goto put_child;
+				goto free_map;
 			}
 
 			ret = of_property_read_u32_array(child, "pinmux", pinmux, npins);
 			if (ret)
-				goto put_child;
+				goto free_map;
 
 			for (i = 0; i < npins; i++) {
 				unsigned int gpio = starfive_pinmux_to_gpio(pinmux[i]);
@@ -570,7 +567,7 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
 			pins = devm_kcalloc(dev, npins, sizeof(*pins), GFP_KERNEL);
 			if (!pins) {
 				ret = -ENOMEM;
-				goto put_child;
+				goto free_map;
 			}
 
 			pinmux = NULL;
@@ -580,18 +577,18 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
 
 				ret = of_property_read_u32_index(child, "pins", i, &v);
 				if (ret)
-					goto put_child;
+					goto free_map;
 				pins[i] = v;
 			}
 		} else {
 			ret = -EINVAL;
-			goto put_child;
+			goto free_map;
 		}
 
 		ret = pinctrl_generic_add_group(pctldev, grpname, pins, npins, pinmux);
 		if (ret < 0) {
 			dev_err(dev, "error adding group %s: %d\n", grpname, ret);
-			goto put_child;
+			goto free_map;
 		}
 
 		ret = pinconf_generic_parse_dt_config(child, pctldev,
@@ -600,7 +597,7 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
 		if (ret) {
 			dev_err(dev, "error parsing pin config of group %s: %d\n",
 				grpname, ret);
-			goto put_child;
+			goto free_map;
 		}
 
 		/* don't create a map if there are no pinconf settings */
@@ -623,8 +620,6 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev,
 	mutex_unlock(&sfp->mutex);
 	return 0;
 
-put_child:
-	of_node_put(child);
 free_map:
 	pinctrl_utils_free_map(pctldev, map, nmaps);
 	mutex_unlock(&sfp->mutex);
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
index 9609eb1ecc3d..4ce080caa233 100644
--- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
+++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c
@@ -150,7 +150,7 @@ static int jh7110_dt_node_to_map(struct pinctrl_dev *pctldev,
 	nmaps = 0;
 	ngroups = 0;
 	mutex_lock(&sfp->mutex);
-	for_each_available_child_of_node(np, child) {
+	for_each_available_child_of_node_scoped(np, child) {
 		int npins = of_property_count_u32_elems(child, "pinmux");
 		int *pins;
 		u32 *pinmux;
@@ -161,13 +161,13 @@ static int jh7110_dt_node_to_map(struct pinctrl_dev *pctldev,
 				"invalid pinctrl group %pOFn.%pOFn: pinmux not set\n",
 				np, child);
 			ret = -EINVAL;
-			goto put_child;
+			goto free_map;
 		}
 
 		grpname = devm_kasprintf(dev, GFP_KERNEL, "%pOFn.%pOFn", np, child);
 		if (!grpname) {
 			ret = -ENOMEM;
-			goto put_child;
+			goto free_map;
 		}
 
 		pgnames[ngroups++] = grpname;
@@ -175,18 +175,18 @@ static int jh7110_dt_node_to_map(struct pinctrl_dev *pctldev,
 		pins = devm_kcalloc(dev, npins, sizeof(*pins), GFP_KERNEL);
 		if (!pins) {
 			ret = -ENOMEM;
-			goto put_child;
+			goto free_map;
 		}
 
 		pinmux = devm_kcalloc(dev, npins, sizeof(*pinmux), GFP_KERNEL);
 		if (!pinmux) {
 			ret = -ENOMEM;
-			goto put_child;
+			goto free_map;
 		}
 
 		ret = of_property_read_u32_array(child, "pinmux", pinmux, npins);
 		if (ret)
-			goto put_child;
+			goto free_map;
 
 		for (i = 0; i < npins; i++)
 			pins[i] = jh7110_pinmux_pin(pinmux[i]);
@@ -200,7 +200,7 @@ static int jh7110_dt_node_to_map(struct pinctrl_dev *pctldev,
 						pins, npins, pinmux);
 		if (ret < 0) {
 			dev_err(dev, "error adding group %s: %d\n", grpname, ret);
-			goto put_child;
+			goto free_map;
 		}
 
 		ret = pinconf_generic_parse_dt_config(child, pctldev,
@@ -209,7 +209,7 @@ static int jh7110_dt_node_to_map(struct pinctrl_dev *pctldev,
 		if (ret) {
 			dev_err(dev, "error parsing pin config of group %s: %d\n",
 				grpname, ret);
-			goto put_child;
+			goto free_map;
 		}
 
 		/* don't create a map if there are no pinconf settings */
@@ -233,8 +233,6 @@ static int jh7110_dt_node_to_map(struct pinctrl_dev *pctldev,
 	*num_maps = nmaps;
 	return 0;
 
-put_child:
-	of_node_put(child);
 free_map:
 	pinctrl_utils_free_map(pctldev, map, nmaps);
 	mutex_unlock(&sfp->mutex);

-- 
2.37.1