From patchwork Sat May 4 13:20:18 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: 794885 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2066.outbound.protection.outlook.com [40.107.22.66]) (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 1F92438394; Sat, 4 May 2024 13:17:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.22.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714828679; cv=fail; b=p/vNYG+6u7IHsuuZYZGMx/RlfWfc1eNHhGZEuSZKbHWFo4PEiw/Q8Liz0xh+SFOieEGeyLjd4MBANNx4Ow386ChMXtJpF+iUd5i6BXl2fPUn8yw2QrfLM4ye+sU4WcCEOXd4RfUuRDQQ2lRCbOV65cX84lae1uxayBDfUlyc5c4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714828679; c=relaxed/simple; bh=wMNSJkH/G6gb8vDhU37wTmbLXobqUGpvvFnYEW9f+eM=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=TBTkh4ZMsufjGcWdgJWdjZL3icZnZmp7299YZ+XWNNjkThsDY4OnqiTK8WJE8IKTJKpWMs6rKsqFZiFrCNWYtObdMgeAvTDYnOu9EIrhw4uKN+X1RYfju6rDVS4VZvuTNshp/4HeeteUF8y0fs2Wx1J0Gf07t5IKgjNtFkmYZOo= 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=BiuzAJRq; arc=fail smtp.client-ip=40.107.22.66 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="BiuzAJRq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MeqS3lzaTiTvvMpQkhxAqx5LXu9Qz5Eun3vOl5nnj8mwXBiR+kPagCszrMCqC/HX7ErnmtqmkeHTlsQl7mCDF5OUcE2weGzTeSDHfeYnp627g+vC66DWr5E2/g0ozE3Oxe3HpjuwAK8453pa3XLNlyrFkMhz1aWOVQXdfoJJSarYTNDNhZXlFk1zo7DHTyvhVq7GQc0xx6AOWV8BG2Z343zDEYH9BJMW4vx6fWZakzmjimLoG0RmF6npsV0ooZRo3KVzUHfYatmil55/XwTirR6IhZ6eddWT/jwf3pcth51hCFg9Nw4lxdARDPsLR4HOLxLpr9s9edGjfYIKroB11A== 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=Ppg9aWlK4+huIGMqna4KeQPNUar5cHCrgX7Io5VTsjo=; b=eSqoOAsUP7zY+Kz27f04NZE8iZsc0ibTh/UKOCUYR1zdYHH2E8lajoRSyA8sDy3HvYin2IPk9R9VINGcz+xnoU97GgyO8xrHjmxu2PIo0KvE6tC7T/CwSOswA7haahV0t3JTAFusYl7ZfoYYlEyg3x/jM8xnEE8NlM9isHl5oWn1cm/Ts8fvWezutcVuUjLsPXSXVuNq8PsDytUlaICnsw+GZuSTWAzjFVSBxhATNrlGrb6xEVrIa8kevPTzME95TFC+O5OgK9hFHWIPZQ0VjhfolUDqh/LI067mWsjVDswRfZ9stebFk4P+850KwVhkLF2pWkabx1CYbNVTUU8lSg== 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=Ppg9aWlK4+huIGMqna4KeQPNUar5cHCrgX7Io5VTsjo=; b=BiuzAJRqpHcg55cTD7Unx+2M7N8+VFhoSv+0CWmFBcYl7Z/WnOM/7NK2dREH09pZnPG9i0D+o39Dt0+CWJE4qgWqLizCKQMOXCFo2BGb5flRUGdzlr/E+bM7i1JWwUDG2zPwHzjuq5+8P3TF0T71rpYbqr3BGQgJwdLA/S60Cm8= 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:17:54 +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:17:54 +0000 From: "Peng Fan (OSS)" Date: Sat, 04 May 2024 21:20:18 +0800 Subject: [PATCH v2 20/20] pinctrl: samsung: Use scope based of_node_put() cleanups Message-Id: <20240504-pinctrl-cleanup-v2-20-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=4267; i=peng.fan@nxp.com; s=20230812; h=from:subject:message-id; bh=Eha3FnaEY3bzUrakRMW1Ov8R+kXDm5JzTBhq10KxbQk=; b=j1GGjC8jOMD9Vols6kLJMsB1llGpiQjkJR5IlNAnfWDcAKwLbiKZUAALPTehYonJf7lE4q/wH yzEqddp4EMID2GMdMRfAxpHQh4H/pYIY+KCEK/dlCVBsLbU5lsfKaOD 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: 88a760b2-963a-44f4-0ccf-08dc6c3c9b5e 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?AtwvJC6/zUrpSsZ6zKp3RcwBbFkQto5?= =?utf-8?q?L6AE6n7fLHXhWlTVvBXlqQu6ey92kjxjDM2x6zaWdrfLr8WKkayeTsOgVoqh2brSI?= =?utf-8?q?luqFAE2bzbEJvkaeiqamJf0BKG7uVIlqA1iKvMjiLn5ulU6KsQvwqbb9HeTQzIaYR?= =?utf-8?q?tRr2MT643v+40LE2QfkTaucI/V6tfzG9oIVMIHWg/OsPzrkkObijT7pGJtULt3A3a?= =?utf-8?q?nGnD/tTeSZWZ4tdKUc6/Fsva7IBp62fXzBeUzMC5pCBh1bJeyuOVSvI8RgiKn+cC2?= =?utf-8?q?vEdI1YsNH9oXrjp+soaLa8gYVaKDdHI3w1wOXm0L0wZXKn2a87J8Ax8t4jyRWExwG?= =?utf-8?q?gNiOp13g6iYTEAIAn/pfJ7OC/vSm1IKXiHpRzpIeU5dJ4I4/g7ygU19e6fOlyKmHU?= =?utf-8?q?HZOqyqFUJiHVkDn/viJ1lCe4/uu2r0cCl8BFE3l+vrL0ltawaAnOyvruXmoCYW5bv?= =?utf-8?q?04Mhew2wlAXkhqsLvYyvb9qX7EcMAeB3oVsFPoU/eM9Z+02mf8HvncLpjiNPJPcqJ?= =?utf-8?q?3usS/sluMKTQEyVHwqj0izuFZJpcHK5zIklEpPG3IJhtBUr5lTLSefj3SIqgqayYc?= =?utf-8?q?4wM4eKasz7BBCWpw5quPf3MKmONa8vmV73yYhzQ7vDMC7xrmzlSCOSck7FFvOMmEC?= =?utf-8?q?MxI4HnYfiJFxKNFOAa+dvjNOjeekWrKqFYzXJnMM7x/gTd4LaiVnayFiEmnsPP4dS?= =?utf-8?q?iMoWmZT7yRXr1pKSR05ynvCnGfeT2VQPTraGIsB17LCfx4TCGAwlIbbxmXyssLvDg?= =?utf-8?q?Ir51fep/uiPu9jlyHSzKsHTQowYUsF5OoE1y+NygCGLbwZAdfE/IqjFfxvcUhbRe8?= =?utf-8?q?3rO57uqkcSQlSJgpUPsXuhiP4YpPAgYRlTl06Es54OWICS8M9rWhCZWnXEtptSdLN?= =?utf-8?q?TxUfC4VwrzPzmj+qGG7ruFF9bTN7cKQWqJLVfMkT5h1jSdkQ6o2Fx3nSOQzJMxUsW?= =?utf-8?q?OsM+2vZEkKm5OTSapbLXQ5zPSnUUdYpATOr1XEMVBKhPEnX8K0fryBUqoTBJJBwfK?= =?utf-8?q?GS7gHC1K3ZkZkKoLeGxeh3B7unYuK1qcJ/IugwDeeCRKRjiy6O3OOsD49JjID1xZe?= =?utf-8?q?QK7swmDFxyGDsRgsZKFxPP1aux7aTgDc1+SSP7atsgUGTK2/pqGLpM6oReiJiigV8?= =?utf-8?q?DTC6qw1tWzlUFheL8AXq8rzInMEc49xSA0bK11dw/VUqtisClx/ysuZsJ+ZatmNCS?= =?utf-8?q?FjwgKgZl31cwh7qwWkUyQ+nyIvTtz3JGsda7UAV3tZnnHHzh8PL9SDhJH/ggGZPs5?= =?utf-8?q?GC+w/F3G9Dmi93I8Kjeo5nj42PJt+NXtAKdRgjYHq9jkqvSUlEv3EhhQ=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?l7dVC5mjZPZI0TQrrAclJB2SDdFf?= =?utf-8?q?KZp1r4UlfpbGq7vOc6GhMaH5PYh3SJjAR29E8DoUiYwWnTFUtzrf+6dCHqSBFruds?= =?utf-8?q?kzNhAvPtlDg/GLvJT15BUIaaUnQZQgeXJAJK8kcpWtjMqKSzsyfyhChrwsxbh0c62?= =?utf-8?q?t1U6vDrk3fXX9DRbmyWdaDHmyZzUAy2R13aWUb4LdBuoNaZBL2zqexW315S4CoMfe?= =?utf-8?q?6WmzACttQewofKU+5uMnXbNIgiRlGGR+jZBfVu4hRiyRzrkeqmrDDyPFXxZVGWBSe?= =?utf-8?q?oA8ihokDhrWNC8OWFgR2ExmNRobSwSM2evZ6jq0wbW6SQ68yTINdKXNeMwSarHr3C?= =?utf-8?q?GCd9yG7Vf3ExDIgjGKsiWd0GfwDIhjnThYpHG2J17EF447mV/ZMjg/15KzaftGzLP?= =?utf-8?q?ZrOgzDd8xqWCHYW+Zz2u29xtYGDWOhOFLwG0LF9pZLZUa9ly0/Sil8uBDwW7N3njA?= =?utf-8?q?PVd1awbqxUc6ff6ExhbLjyf3gJlxzJNmTtfIVotQ6m8HpX6TNmf3Mr+ZFc9q/60p5?= =?utf-8?q?TSrQCJ4dWy245SS/Vpan1yb+Szf9nKXb7IQ3PHaWN1zuTt2LnvLomp/cJso4BXCq+?= =?utf-8?q?PcAdR98v/1DP17WYvOQinNNc72f6s814oDaSw3Wej/SRzIWo+C+wwnbjxWKkfPzTn?= =?utf-8?q?f0GutWuCYS1K8REFFjfqyZRKPI5GtmcA7eEJdNIbpmHKqwl41vP4mcueB7qOAJvr1?= =?utf-8?q?NZjC0GDYOzk3g1lXSIjY+vPHkMp78IS3q32Ly0I47JoYTGSPJ1uAODU7nIVjKGKgn?= =?utf-8?q?4LJyWreW8GbYCue5/Q92GHQZbtLE/ufXYpLtiZ8CujcmhLKul/HRpN8eT83fw8Opk?= =?utf-8?q?Fs2J2iYJwiEwl0hTCQ7C8VVDdM+fgSmfaEbQLR5MPCtDnrVD6jZKzhJQ1sAkxU3GH?= =?utf-8?q?zpIHzFMwxxZhGco+jLA5TCvEOX9d06U1cRdfi1LRnKF/6+uXNClGO3CfJILtv/3cz?= =?utf-8?q?/J1pqLrrVzHZK1OmENOssnOnBrq5Vm36iHzClKCmISeY9uFN6DQKwuhgM458Ld4Ay?= =?utf-8?q?q3wsaXBvcl8ShQ4mQlg0TLxQY9zbtFWXXR5llQ27gdR4W1AuW199HB2CbHbW9xDFe?= =?utf-8?q?J76Bup4bL5/V8aIumPU3iH+7Pgs5fJAo5U996W91m9M1bv15epRv447RD99VFs4Lf?= =?utf-8?q?f2e5E7SQRHfoLfQWKwd8OQd8ZfmCajHnT/JhTDMyTYGgy2HmhaztFNrL5RLo9SgWT?= =?utf-8?q?e7R7NGvWNrC4R82kclbSn+o0oUghcOgK1MtbAhhqfQ66XCYNY/FAlQShIFhD0mZYE?= =?utf-8?q?sVbUjGZJPrnuKS6u/uhy4qrr5TvKhrRsKRKaLMkwpLTv6vzXHG/oOlIwU3fPZNRuz?= =?utf-8?q?vgWdhukf8/B3uCdToLoHPoI3FyWm7JT+tarGljp8HM9PV9qhtvFEE+1b+Mw+QQDJo?= =?utf-8?q?IL7IidwqP8XFJyQQ+RyoZs9Xx/wnogtYifPB1gbMPVR+A0XbFx8w3yc3vT6dSzgVS?= =?utf-8?q?605oxvK+I97FwFjovf+hW2FzdyFTqFZekOOqJL8KyIscdc3CnLZSj0sc2s3iOIgmV?= =?utf-8?q?Im42Bh4c/Evd?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88a760b2-963a-44f4-0ccf-08dc6c3c9b5e 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:17:54.1216 (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: Myzq3/6MY/HfklO204D+tBTrg7YaOAS/vgCDdDbFCJdHIDCD0ERvNPhbgg//sC5GpTgalc5VpfcOuOy0J9z9lw== 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/samsung/pinctrl-exynos.c | 16 ++++------------ drivers/pinctrl/samsung/pinctrl-samsung.c | 19 +++++-------------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c index 871c1eb46ddf..3775999536e2 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos.c @@ -582,7 +582,7 @@ static void exynos_irq_demux_eint16_31(struct irq_desc *desc) __init int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d) { struct device *dev = d->dev; - struct device_node *wkup_np = NULL; + struct device_node *wkup_np __free(device_node) = NULL; struct device_node *np; struct samsung_pin_bank *bank; struct exynos_weint_data *weint_data; @@ -612,17 +612,14 @@ __init int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d) bank->irq_chip = devm_kmemdup(dev, irq_chip, sizeof(*irq_chip), GFP_KERNEL); - if (!bank->irq_chip) { - of_node_put(wkup_np); + if (!bank->irq_chip) return -ENOMEM; - } bank->irq_chip->chip.name = bank->name; bank->irq_domain = irq_domain_create_linear(bank->fwnode, bank->nr_pins, &exynos_eint_irqd_ops, bank); if (!bank->irq_domain) { dev_err(dev, "wkup irq domain add failed\n"); - of_node_put(wkup_np); return -ENXIO; } @@ -635,10 +632,8 @@ __init int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d) weint_data = devm_kcalloc(dev, bank->nr_pins, sizeof(*weint_data), GFP_KERNEL); - if (!weint_data) { - of_node_put(wkup_np); + if (!weint_data) return -ENOMEM; - } for (idx = 0; idx < bank->nr_pins; ++idx) { irq = irq_of_parse_and_map(to_of_node(bank->fwnode), idx); @@ -655,13 +650,10 @@ __init int exynos_eint_wkup_init(struct samsung_pinctrl_drv_data *d) } } - if (!muxed_banks) { - of_node_put(wkup_np); + if (!muxed_banks) return 0; - } irq = irq_of_parse_and_map(wkup_np, 0); - of_node_put(wkup_np); if (!irq) { dev_err(dev, "irq number for muxed EINTs not found\n"); return 0; diff --git a/drivers/pinctrl/samsung/pinctrl-samsung.c b/drivers/pinctrl/samsung/pinctrl-samsung.c index ed07e23e0912..0d4d7ebf7145 100644 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c @@ -250,7 +250,6 @@ static int samsung_dt_node_to_map(struct pinctrl_dev *pctldev, { struct samsung_pinctrl_drv_data *drvdata; unsigned reserved_maps; - struct device_node *np; int ret; drvdata = pinctrl_dev_get_drvdata(pctldev); @@ -265,12 +264,11 @@ static int samsung_dt_node_to_map(struct pinctrl_dev *pctldev, &reserved_maps, num_maps); - for_each_child_of_node(np_config, np) { + for_each_child_of_node_scoped(np_config, np) { ret = samsung_dt_subnode_to_map(drvdata, pctldev->dev, np, map, &reserved_maps, num_maps); if (ret < 0) { samsung_dt_free_map(pctldev, *map, *num_maps); - of_node_put(np); return ret; } } @@ -791,16 +789,12 @@ static struct samsung_pmx_func *samsung_pinctrl_create_functions( * and create pin groups and pin function lists. */ func_cnt = 0; - for_each_child_of_node(dev_np, cfg_np) { - struct device_node *func_np; - + for_each_child_of_node_scoped(dev_np, cfg_np) { if (!of_get_child_count(cfg_np)) { ret = samsung_pinctrl_create_function(dev, drvdata, cfg_np, func); - if (ret < 0) { - of_node_put(cfg_np); + if (ret < 0) return ERR_PTR(ret); - } if (ret > 0) { ++func; ++func_cnt; @@ -808,14 +802,11 @@ static struct samsung_pmx_func *samsung_pinctrl_create_functions( continue; } - for_each_child_of_node(cfg_np, func_np) { + for_each_child_of_node_scoped(cfg_np, func_np) { ret = samsung_pinctrl_create_function(dev, drvdata, func_np, func); - if (ret < 0) { - of_node_put(func_np); - of_node_put(cfg_np); + if (ret < 0) return ERR_PTR(ret); - } if (ret > 0) { ++func; ++func_cnt;