Commit 4c0255e7 authored by Yuan Can's avatar Yuan Can Committed by Vinod Koul
Browse files

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: default avatarYuan Can <yuancan@huawei.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAndrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/20220924070300.25080-2-yuancan@huawei.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent c3966ced

drivers/phy/qualcomm/phy-qcom-qmp-combo.c

+7 −14
Original line number Diff line number Diff line
@@ -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 ? */