From: Hans Zhang <18255117159@163.com>
Date: Tue, 7 Apr 2026 01:31:22 +0000 (+0800)
Subject: USB: of: Simplify with scoped for each OF child loop
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a8881aab5d3e69dd72d1b18bbde39be6f4664bf;p=thirdparty%2Fkernel%2Flinux.git

USB: of: Simplify with scoped for each OF child loop

Use scoped for-each loop when iterating over device nodes to make code a
bit simpler.

Signed-off-by: Hans Zhang <18255117159@163.com>
Link: https://patch.msgid.link/20260407013122.1296818-1-18255117159@163.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/core/of.c b/drivers/usb/core/of.c
index 763e4122ed5b..a6ee20d8774e 100644
--- a/drivers/usb/core/of.c
+++ b/drivers/usb/core/of.c
@@ -79,17 +79,13 @@ EXPORT_SYMBOL_GPL(usb_of_has_combined_node);
 static bool usb_of_has_devices_or_graph(const struct usb_device *hub)
 {
 	const struct device_node *np = hub->dev.of_node;
-	struct device_node *child;
 
 	if (of_graph_is_present(np))
 		return true;
 
-	for_each_child_of_node(np, child) {
-		if (of_property_present(child, "reg")) {
-			of_node_put(child);
+	for_each_child_of_node_scoped(np, child)
+		if (of_property_present(child, "reg"))
 			return true;
-		}
-	}
 
 	return false;
 }