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 C210D2DE6F1; Thu, 3 Jul 2025 15:21:53 +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=1751556113; cv=none; b=N00KUvmt1euQkOiwm8QNG0gW2Yt/kNV48ESETcsVQQP43v4tyJqc3JrrrQo1hzQo4S7WgrFrGcamOKDJJQv2p2X/6WtGEFN5524DUim10Dnb1PnzRXmn9ffQGPvc81WUcG+8f5dAblxEGdx8TZgiw0GeHR+5HHDr+X9LjugVEts= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751556113; c=relaxed/simple; bh=VqriyrAv1yGIRTUoKxili9LxC2iCDn1dKtnAa+5bx74=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tCDEGTlkGvCzR3AvWb/T6dcUq016yGdO/BxB9V6Xif6SqETxXKACH6+Zi9mDn8qvto48WKY/MiEpzrn3lFuDgM51GqAefIo9MXOsrOX8zrU+qTtQjQthza4IGwwTl1+mlJn67pTKEVbw0+4w5eK6p1aV+i18DD8YEhnbQGDDU7s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FI4TQqvo; 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="FI4TQqvo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3BF0C4CEE3; Thu, 3 Jul 2025 15:21:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1751556113; bh=VqriyrAv1yGIRTUoKxili9LxC2iCDn1dKtnAa+5bx74=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FI4TQqvoNYbpEJBsp8AUEkpRHD/6nVY2TqaCq9rTKONQrgDqcA/XWzLK9TuTdzJ5C srNFSG+MgiQTIcMGzee7V4ebDO3XbGne160IAU2VXCIwD33+MrQ4vU0Nbflv9oU0Pu AUuU+hX58nKPKZM4n6eRXu+zrosEw8SpqnjGViMQ= 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.1 061/132] PCI: apple: Use helper function for_each_child_of_node_scoped() Date: Thu, 3 Jul 2025 16:42:30 +0200 Message-ID: <20250703143941.811500259@linuxfoundation.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250703143939.370927276@linuxfoundation.org> References: <20250703143939.370927276@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-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 fbe59139ab8fb..b1f32e4c65989 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