From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 137FD2F0C55; Thu, 3 Jul 2025 15:12:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751555576; cv=none; b=fGmAgMO9ESFjwOKTp/EjCGO1MKbxW0TGKKnkg+KELrsQYTSjCcOzfDKOlb+335qciAPi6dc0fcZkd1MpXTpAPKObsJu4oLIrxO3AOrDiZMcLyFv2s2TvidCt+P4ZObu9QJy6goY2goESkiu4jGJYcF41qj5DrcI8WYOCcuv6NLo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751555576; c=relaxed/simple; bh=71GHc9DFBFDbuTKhIH/AFf4nu9esJx1if0qjou4VIZA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jCyJMjq9DQtryHOarFxzC9e+ZEay5Gf0N3EbslC0lUBs+21uLw1kUjj20HoejV2iO+1/66lWlk6D/FD1IEXrVmndJMmhcbVlmpmS5+Y6sdmu4conYzaBCvHo0sUct5crmHPih7DFggtvEh8JnuJc/+zRXq5VO9NjML8zECXVU7g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=morTexrv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="morTexrv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1880AC4CEE3; Thu, 3 Jul 2025 15:12:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1751555575; bh=71GHc9DFBFDbuTKhIH/AFf4nu9esJx1if0qjou4VIZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=morTexrvG4VMepFV+FNFEWzZM8bO1T+THapQqMoMcsnRIe+95P+KTHTAa3Ckk2V3P QpFUtRNAkCk30wX2WubUuElPLJKY+EuxI8ao/axMJoRlgv36tmieFC8ap8UqVWqGli rzDSWBQjRpX6aH/xCs3Y4r944fTWhnmiBSvp6N/s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhang Zekun , Jonathan Cameron , Manivannan Sadhasivam , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Sasha Levin Subject: [PATCH 6.6 056/139] PCI: apple: Use helper function for_each_child_of_node_scoped() Date: Thu, 3 Jul 2025 16:41:59 +0200 Message-ID: <20250703143943.353107862@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250703143941.182414597@linuxfoundation.org> References: <20250703143941.182414597@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhang Zekun [ Upstream commit f60b4e06a945f25d463ae065c6e41c6e24faee0a ] The for_each_available_child_of_node_scoped() helper provides a scope-based clean-up functionality to put the device_node automatically, and as such, there is no need to call of_node_put() directly. Thus, use this helper to simplify the code. Signed-off-by: Zhang Zekun Reviewed-by: Jonathan Cameron Reviewed-by: Manivannan Sadhasivam Link: https://lore.kernel.org/r/20240831040413.126417-6-zhangzekun11@huawei.com [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński Stable-dep-of: 751bec089c4e ("PCI: apple: Set only available ports up") Signed-off-by: Sasha Levin --- drivers/pci/controller/pcie-apple.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/pcie-apple.c index 08b7070f05d82..66f8854fc3410 100644 --- a/drivers/pci/controller/pcie-apple.c +++ b/drivers/pci/controller/pcie-apple.c @@ -767,7 +767,6 @@ static int apple_pcie_init(struct pci_config_window *cfg) { struct device *dev = cfg->parent; struct platform_device *platform = to_platform_device(dev); - struct device_node *of_port; struct apple_pcie *pcie; int ret; @@ -790,11 +789,10 @@ static int apple_pcie_init(struct pci_config_window *cfg) if (ret) return ret; - for_each_child_of_node(dev->of_node, of_port) { + for_each_child_of_node_scoped(dev->of_node, of_port) { ret = apple_pcie_setup_port(pcie, of_port); if (ret) { dev_err(pcie->dev, "Port %pOF setup fail: %d\n", of_port, ret); - of_node_put(of_port); return ret; } } -- 2.39.5