OSDN Git Service

phy: qcom-qmp-ufs: clean up device-tree parsing
authorJohan Hovold <johan+linaro@kernel.org>
Mon, 24 Oct 2022 09:00:34 +0000 (11:00 +0200)
committerVinod Koul <vkoul@kernel.org>
Fri, 28 Oct 2022 13:00:30 +0000 (18:30 +0530)
Since the QMP driver split there will be at most a single child node so
drop the obsolete iteration construct.

While at it, drop the verbose error logging that would have been
printed also on probe deferrals.

Note that there's no need to check if there are additional child nodes
(the kernel is not a devicetree validator), but let's return an error if
there are no child nodes at all for now.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20221024090041.19574-4-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/qualcomm/phy-qcom-qmp-ufs.c

index b4c3b3d..25744b3 100644 (file)
@@ -1048,7 +1048,6 @@ static int qmp_ufs_probe(struct platform_device *pdev)
        void __iomem *serdes;
        const struct qmp_phy_cfg *cfg = NULL;
        struct qmp_ufs *qmp;
-       int num, id;
        int ret;
 
        qmp = devm_kzalloc(dev, sizeof(*qmp), GFP_KERNEL);
@@ -1074,23 +1073,15 @@ static int qmp_ufs_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       num = of_get_available_child_count(dev->of_node);
-       /* do we have a rogue child node ? */
-       if (num > 1)
+       child = of_get_next_available_child(dev->of_node, NULL);
+       if (!child)
                return -EINVAL;
 
-       id = 0;
-       for_each_available_child_of_node(dev->of_node, child) {
-               /* Create per-lane phy */
-               ret = qmp_ufs_create(dev, child, serdes, cfg);
-               if (ret) {
-                       dev_err(dev, "failed to create lane%d phy, %d\n",
-                               id, ret);
-                       goto err_node_put;
-               }
+       ret = qmp_ufs_create(dev, child, serdes, cfg);
+       if (ret)
+               goto err_node_put;
 
-               id++;
-       }
+       of_node_put(child);
 
        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);