diff options
| author | Yuan Can <yuancan@huawei.com> | 2022-09-24 09:02:57 +0200 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2022-09-24 09:33:49 +0200 |
| commit | 4c0255e7957d5a536c6da7ba08cbb46540fb5d42 (patch) | |
| tree | 06a4528e9473191ec87ebf668f2de545659785a1 /drivers/phy | |
| parent | phy: qualcomm: call clk_disable_unprepare in the error handling (diff) | |
| download | linux-4c0255e7957d5a536c6da7ba08cbb46540fb5d42.tar.xz linux-4c0255e7957d5a536c6da7ba08cbb46540fb5d42.zip | |
phy: qcom-qmp-combo: Use dev_err_probe() to simplify code
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>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20220924070300.25080-2-yuancan@huawei.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/phy')
| -rw-r--r-- | drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index ad3b0aa22048..9807c4d935cd 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -2717,14 +2717,10 @@ static int qmp_combo_create(struct device *dev, struct device_node *np, int id, */ qphy->pipe_clk = devm_get_clk_from_child(dev, np, NULL); if (IS_ERR(qphy->pipe_clk)) { - if (cfg->type == PHY_TYPE_USB3) { - ret = PTR_ERR(qphy->pipe_clk); - if (ret != -EPROBE_DEFER) - dev_err(dev, - "failed to get lane%d pipe_clk, %d\n", - id, ret); - return ret; - } + if (cfg->type == PHY_TYPE_USB3) + return dev_err_probe(dev, PTR_ERR(qphy->pipe_clk), + "failed to get lane%d pipe_clk\n", + id); qphy->pipe_clk = NULL; } @@ -2837,12 +2833,9 @@ static int qmp_combo_probe(struct platform_device *pdev) return ret; ret = qmp_combo_vreg_init(dev, cfg); - 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"); num = of_get_available_child_count(dev->of_node); /* do we have a rogue child node ? */ |