From: Yuan Can <yuancan@huawei.com>
To: <agross@kernel.org>, <andersson@kernel.org>,
<konrad.dybcio@somainline.org>, <kishon@ti.com>,
<vkoul@kernel.org>, <linux-arm-msm@vger.kernel.org>,
<linux-phy@lists.infradead.org>
Cc: <yuancan@huawei.com>
Subject: [PATCH 6/7] phy: qcom-qusb2: Use dev_err_probe() to simplify code
Date: Thu, 22 Sep 2022 11:12:27 +0000 [thread overview]
Message-ID: <20220922111228.36355-7-yuancan@huawei.com> (raw)
In-Reply-To: <20220922111228.36355-1-yuancan@huawei.com>
In the probe path, dev_err() can be replaced with dev_err_probe()
which will check if error code is -EPROBE_DEFER and prints the
error name. It also sets the defer probe reason which can be
checked later through debugfs.
Signed-off-by: Yuan Can <yuancan@huawei.com>
---
drivers/phy/qualcomm/phy-qcom-qusb2.c | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-qusb2.c b/drivers/phy/qualcomm/phy-qcom-qusb2.c
index 7529a7e6e5df..2ef638b32e8f 100644
--- a/drivers/phy/qualcomm/phy-qcom-qusb2.c
+++ b/drivers/phy/qualcomm/phy-qcom-qusb2.c
@@ -973,20 +973,14 @@ static int qusb2_phy_probe(struct platform_device *pdev)
return PTR_ERR(qphy->base);
qphy->cfg_ahb_clk = devm_clk_get(dev, "cfg_ahb");
- if (IS_ERR(qphy->cfg_ahb_clk)) {
- ret = PTR_ERR(qphy->cfg_ahb_clk);
- if (ret != -EPROBE_DEFER)
- dev_err(dev, "failed to get cfg ahb clk, %d\n", ret);
- return ret;
- }
+ if (IS_ERR(qphy->cfg_ahb_clk))
+ return dev_err_probe(dev, PTR_ERR(qphy->cfg_ahb_clk),
+ "failed to get cfg ahb clk\n");
qphy->ref_clk = devm_clk_get(dev, "ref");
- if (IS_ERR(qphy->ref_clk)) {
- ret = PTR_ERR(qphy->ref_clk);
- if (ret != -EPROBE_DEFER)
- dev_err(dev, "failed to get ref clk, %d\n", ret);
- return ret;
- }
+ if (IS_ERR(qphy->ref_clk))
+ return dev_err_probe(dev, PTR_ERR(qphy->ref_clk),
+ "failed to get ref clk\n");
qphy->iface_clk = devm_clk_get_optional(dev, "iface");
if (IS_ERR(qphy->iface_clk))
@@ -1003,12 +997,9 @@ static int qusb2_phy_probe(struct platform_device *pdev)
qphy->vregs[i].supply = qusb2_phy_vreg_names[i];
ret = devm_regulator_bulk_get(dev, num, qphy->vregs);
- if (ret) {
- if (ret != -EPROBE_DEFER)
- dev_err(dev, "failed to get regulator supplies: %d\n",
- ret);
- return ret;
- }
+ if (ret)
+ return dev_err_probe(dev, ret,
+ "failed to get regulator supplies\n");
/* Get the specific init parameters of QMP phy */
qphy->cfg = of_device_get_match_data(dev);
--
2.17.1
next prev parent reply other threads:[~2022-09-22 11:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-22 11:12 [PATCH 0/7] Use dev_err_probe() to simplify code Yuan Can
2022-09-22 11:12 ` [PATCH 1/7] phy: qcom-qmp-combo: " Yuan Can
2022-09-22 18:03 ` Dmitry Baryshkov
2022-09-22 11:12 ` [PATCH 2/7] phy: qcom-qmp-pcie-msm8996: " Yuan Can
2022-09-22 18:03 ` Dmitry Baryshkov
2022-09-22 11:12 ` [PATCH 3/7] phy: qcom-qmp-pcie: " Yuan Can
2022-09-22 12:46 ` Neil Armstrong
2022-09-22 18:03 ` Dmitry Baryshkov
2022-09-22 11:12 ` [PATCH 4/7] phy: qcom-qmp-ufs: " Yuan Can
2022-09-22 18:03 ` Dmitry Baryshkov
2022-09-22 11:12 ` [PATCH 5/7] phy: qcom-qmp-usb: " Yuan Can
2022-09-22 12:46 ` Neil Armstrong
2022-09-22 18:04 ` Dmitry Baryshkov
2022-09-22 11:12 ` Yuan Can [this message]
2022-09-22 12:49 ` [PATCH 6/7] phy: qcom-qusb2: " Neil Armstrong
2022-09-22 18:05 ` Dmitry Baryshkov
2022-09-22 11:12 ` [PATCH 7/7] phy: qcom-snps: " Yuan Can
2022-09-22 18:05 ` Dmitry Baryshkov
2022-09-22 14:26 ` [PATCH 0/7] " Andrew Halaney
2022-09-24 6:38 ` Vinod Koul
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=20220922111228.36355-7-yuancan@huawei.com \
--to=yuancan@huawei.com \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=kishon@ti.com \
--cc=konrad.dybcio@somainline.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-phy@lists.infradead.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