devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johan Hovold <johan+linaro@kernel.org>
To: Vinod Koul <vkoul@kernel.org>
Cc: Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Konrad Dybcio <konrad.dybcio@somainline.org>,
	Rob Herring <robh+dt@kernel.org>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
	Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
	linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org,
	devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 06/13] phy: qcom-qmp-usb: clean up device-tree parsing
Date: Mon, 24 Oct 2022 12:06:25 +0200	[thread overview]
Message-ID: <20221024100632.20549-7-johan+linaro@kernel.org> (raw)
In-Reply-To: <20221024100632.20549-1-johan+linaro@kernel.org>

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>
---
 drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 40 ++++++++-----------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index e009d63260e7..ccb834a08d5b 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@ -2471,7 +2471,6 @@ static int qmp_usb_probe(struct platform_device *pdev)
 	void __iomem *serdes;
 	const struct qmp_phy_cfg *cfg = NULL;
 	struct qmp_usb *qmp;
-	int num, id;
 	int ret;
 
 	qmp = devm_kzalloc(dev, sizeof(*qmp), GFP_KERNEL);
@@ -2507,44 +2506,29 @@ static int qmp_usb_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;
 
 	pm_runtime_set_active(dev);
 	ret = devm_pm_runtime_enable(dev);
 	if (ret)
-		return ret;
+		goto err_node_put;
 	/*
 	 * Prevent runtime pm from being ON by default. Users can enable
 	 * it using power/control in sysfs.
 	 */
 	pm_runtime_forbid(dev);
 
-	id = 0;
-	for_each_available_child_of_node(dev->of_node, child) {
-		/* Create per-lane phy */
-		ret = qmp_usb_create(dev, child, serdes, cfg);
-		if (ret) {
-			dev_err(dev, "failed to create lane%d phy, %d\n",
-				id, ret);
-			goto err_node_put;
-		}
-
-		/*
-		 * Register the pipe clock provided by phy.
-		 * See function description to see details of this pipe clock.
-		 */
-		ret = phy_pipe_clk_register(qmp, child);
-		if (ret) {
-			dev_err(qmp->dev,
-				"failed to register pipe clock source\n");
-			goto err_node_put;
-		}
-
-		id++;
-	}
+	ret = qmp_usb_create(dev, child, serdes, cfg);
+	if (ret)
+		goto err_node_put;
+
+	ret = phy_pipe_clk_register(qmp, child);
+	if (ret)
+		goto err_node_put;
+
+	of_node_put(child);
 
 	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
 
-- 
2.37.3


  parent reply	other threads:[~2022-10-24 10:07 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-24 10:06 [PATCH 00/13] phy: qcom-qmp-usb: fix sc8280xp binding Johan Hovold
2022-10-24 10:06 ` [PATCH 01/13] phy: qcom-qmp-usb: fix sc8280xp PCS_USB offset Johan Hovold
2022-10-24 13:32   ` Dmitry Baryshkov
2022-10-24 10:06 ` [PATCH 02/13] phy: qcom-qmp-usb: sort device-id table Johan Hovold
2022-10-24 13:33   ` Dmitry Baryshkov
2022-10-24 10:06 ` [PATCH 03/13] phy: qcom-qmp-usb: move " Johan Hovold
2022-10-24 13:33   ` Dmitry Baryshkov
2022-10-24 10:06 ` [PATCH 04/13] phy: qcom-qmp-usb: move pm ops Johan Hovold
2022-10-24 13:33   ` Dmitry Baryshkov
2022-10-24 10:06 ` [PATCH 05/13] phy: qcom-qmp-usb: merge driver data Johan Hovold
2022-10-24 13:33   ` Dmitry Baryshkov
2022-10-24 10:06 ` Johan Hovold [this message]
2022-10-24 13:34   ` [PATCH 06/13] phy: qcom-qmp-usb: clean up device-tree parsing Dmitry Baryshkov
2022-10-24 10:06 ` [PATCH 07/13] phy: qcom-qmp-usb: clean up probe initialisation Johan Hovold
2022-10-24 13:34   ` Dmitry Baryshkov
2022-10-24 10:06 ` [PATCH 08/13] phy: qcom-qmp-usb: rename PHY ops structure Johan Hovold
2022-10-24 13:34   ` Dmitry Baryshkov
2022-10-24 10:06 ` [PATCH 09/13] phy: qcom-qmp-usb: clean up PHY init Johan Hovold
2022-10-24 13:34   ` Dmitry Baryshkov
2022-10-24 10:06 ` [PATCH 10/13] dt-bindings: phy: qcom,qmp-usb: rename current bindings Johan Hovold
2022-10-28  2:12   ` Krzysztof Kozlowski
2022-10-24 10:06 ` [PATCH 11/13] dt-bindings: phy: qcom,qmp-usb: fix sc8280xp binding Johan Hovold
2022-10-28  2:15   ` Krzysztof Kozlowski
2022-10-28  6:09     ` Johan Hovold
2022-10-28  6:13       ` Johan Hovold
2022-10-28 13:05       ` Vinod Koul
2022-10-24 10:06 ` [PATCH 12/13] phy: qcom-qmp-usb: restructure PHY creation Johan Hovold
2022-10-24 13:35   ` Dmitry Baryshkov
2022-10-24 10:06 ` [PATCH 13/13] phy: qcom-qmp-usb: add support for updated sc8280xp binding Johan Hovold
2022-10-24 13:35   ` Dmitry Baryshkov
2022-10-24 13:38     ` Johan Hovold

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221024100632.20549-7-johan+linaro@kernel.org \
    --to=johan+linaro@kernel.org \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.baryshkov@linaro.org \
    --cc=konrad.dybcio@somainline.org \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-phy@lists.infradead.org \
    --cc=robh+dt@kernel.org \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).