phy: broadcom: bcm-cygnus-pcie: Simplify with scoped for each OF child loop

Use scoped for_each_available_child_of_node_scoped() when iterating over
device nodes to make code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20240826-phy-of-node-scope-v1-1-5b4d82582644@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c b/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c
index cc29b08e49ebcb5399c9969cd1cb05fdaefea561..462c61a24ec5cf27c0c51b272607512c32884f6d 100644 (file)
--- a/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c
+++ b/drivers/phy/broadcom/phy-bcm-cygnus-pcie.c
@@ -113,11 +113,10 @@ static const struct phy_ops cygnus_pcie_phy_ops = {
 static int cygnus_pcie_phy_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
-       struct device_node *node = dev->of_node, *child;
+       struct device_node *node = dev->of_node;
        struct cygnus_pcie_phy_core *core;
        struct phy_provider *provider;
        unsigned cnt = 0;
-       int ret;
 
        if (of_get_child_count(node) == 0) {
                dev_err(dev, "PHY no child node\n");
@@ -136,35 +135,31 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
 
        mutex_init(&core->lock);
 
-       for_each_available_child_of_node(node, child) {
+       for_each_available_child_of_node_scoped(node, child) {
                unsigned int id;
                struct cygnus_pcie_phy *p;
 
                if (of_property_read_u32(child, "reg", &id)) {
                        dev_err(dev, "missing reg property for %pOFn\n",
                                child);
-                       ret = -EINVAL;
-                       goto put_child;
+                       return -EINVAL;
                }
 
                if (id >= MAX_NUM_PHYS) {
                        dev_err(dev, "invalid PHY id: %u\n", id);
-                       ret = -EINVAL;
-                       goto put_child;
+                       return -EINVAL;
                }
 
                if (core->phys[id].phy) {
                        dev_err(dev, "duplicated PHY id: %u\n", id);
-                       ret = -EINVAL;
-                       goto put_child;
+                       return -EINVAL;
                }
 
                p = &core->phys[id];
                p->phy = devm_phy_create(dev, child, &cygnus_pcie_phy_ops);
                if (IS_ERR(p->phy)) {
                        dev_err(dev, "failed to create PHY\n");
-                       ret = PTR_ERR(p->phy);
-                       goto put_child;
+                       return PTR_ERR(p->phy);
                }
 
                p->core = core;
@@ -184,9 +179,6 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
        dev_dbg(dev, "registered %u PCIe PHY(s)\n", cnt);
 
        return 0;
-put_child:
-       of_node_put(child);
-       return ret;
 }
 
 static const struct of_device_id cygnus_pcie_phy_match_table[] = {