[PATCH -next RESEND] usb: xhci: Simplify with scoped for each OF child loop

[Jinjie Ruan]

On 2024/8/20 21:46, Alan Stern wrote:
> On Tue, Aug 20, 2024 at 02:56:35PM +0800, Jinjie Ruan wrote:
>> Use scoped for_each_available_child_of_node_scoped() when iterating over
>> device nodes to make code a bit simpler.
>>
>> Signed-off-by: Jinjie Ruan <ruanjinjie at huawei.com>
>> ---
>>  drivers/usb/host/ehci-exynos.c | 9 ++-------
>>  drivers/usb/host/ohci-exynos.c | 9 ++-------
>>  2 files changed, 4 insertions(+), 14 deletions(-)
> 
> The patch changes ehci-exynos.c and ohci-exynos.c.  So then why does the 
> Subject: line say "xhci"?

git log --oneline drivers/usb/host/* shows this subject a lot, so adopt it.

> 
> The contents of the patch look okay.
> 
> Alan Stern
> 
>> diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c
>> index f40bc2a7a124..e3a961d3f5fc 100644
>> --- a/drivers/usb/host/ehci-exynos.c
>> +++ b/drivers/usb/host/ehci-exynos.c
>> @@ -48,7 +48,6 @@ struct exynos_ehci_hcd {
>>  static int exynos_ehci_get_phy(struct device *dev,
>>  				struct exynos_ehci_hcd *exynos_ehci)
>>  {
>> -	struct device_node *child;
>>  	struct phy *phy;
>>  	int phy_number, num_phys;
>>  	int ret;
>> @@ -66,26 +65,22 @@ static int exynos_ehci_get_phy(struct device *dev,
>>  		return 0;
>>  
>>  	/* Get PHYs using legacy bindings */
>> -	for_each_available_child_of_node(dev->of_node, child) {
>> +	for_each_available_child_of_node_scoped(dev->of_node, child) {
>>  		ret = of_property_read_u32(child, "reg", &phy_number);
>>  		if (ret) {
>>  			dev_err(dev, "Failed to parse device tree\n");
>> -			of_node_put(child);
>>  			return ret;
>>  		}
>>  
>>  		if (phy_number >= PHY_NUMBER) {
>>  			dev_err(dev, "Invalid number of PHYs\n");
>> -			of_node_put(child);
>>  			return -EINVAL;
>>  		}
>>  
>>  		phy = devm_of_phy_optional_get(dev, child, NULL);
>>  		exynos_ehci->phy[phy_number] = phy;
>> -		if (IS_ERR(phy)) {
>> -			of_node_put(child);
>> +		if (IS_ERR(phy))
>>  			return PTR_ERR(phy);
>> -		}
>>  	}
>>  
>>  	exynos_ehci->legacy_phy = true;
>> diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
>> index bfa2eba4e3a7..1379e03644b2 100644
>> --- a/drivers/usb/host/ohci-exynos.c
>> +++ b/drivers/usb/host/ohci-exynos.c
>> @@ -37,7 +37,6 @@ struct exynos_ohci_hcd {
>>  static int exynos_ohci_get_phy(struct device *dev,
>>  				struct exynos_ohci_hcd *exynos_ohci)
>>  {
>> -	struct device_node *child;
>>  	struct phy *phy;
>>  	int phy_number, num_phys;
>>  	int ret;
>> @@ -55,26 +54,22 @@ static int exynos_ohci_get_phy(struct device *dev,
>>  		return 0;
>>  
>>  	/* Get PHYs using legacy bindings */
>> -	for_each_available_child_of_node(dev->of_node, child) {
>> +	for_each_available_child_of_node_scoped(dev->of_node, child) {
>>  		ret = of_property_read_u32(child, "reg", &phy_number);
>>  		if (ret) {
>>  			dev_err(dev, "Failed to parse device tree\n");
>> -			of_node_put(child);
>>  			return ret;
>>  		}
>>  
>>  		if (phy_number >= PHY_NUMBER) {
>>  			dev_err(dev, "Invalid number of PHYs\n");
>> -			of_node_put(child);
>>  			return -EINVAL;
>>  		}
>>  
>>  		phy = devm_of_phy_optional_get(dev, child, NULL);
>>  		exynos_ohci->phy[phy_number] = phy;
>> -		if (IS_ERR(phy)) {
>> -			of_node_put(child);
>> +		if (IS_ERR(phy))
>>  			return PTR_ERR(phy);
>> -		}
>>  	}
>>  
>>  	exynos_ohci->legacy_phy = true;
>> -- 
>> 2.34.1
>>