| Message ID | 20240821071752.2335406-1-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e24ed5e2f94e67a2b5d5bb2b45d1d23475189e48 |
| Headers | show |
| Series | [-next,v2] usb: ohci-exynos: Simplify with scoped for each OF child loop | expand |
On Wed, Aug 21, 2024 at 03:17:52PM +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@huawei.com> > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Acked-by: Alan Stern <stern@rowland.harvard.edu> > --- > v2: > - Update the commit subject. > - Spilit into 2 patches. > - Add Reviewed-by. > --- > drivers/usb/host/ohci-exynos.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > 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 >
Hi Jinjie, On Wed, 21 Aug 2024 at 12:40, Jinjie Ruan <ruanjinjie@huawei.com> 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@huawei.com> > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- Reviewed-by: Anand Moon <linux.amoon@gmail.com> Thanks -Anand
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;