Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3471426f authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Kishon Vijay Abraham I
Browse files

phy: qcom-ufs: Correct usage of regulator_get() 



When regulator_get() tries to resolve a regulator supply but fail to
find a matching property in DeviceTree it returns a dummy regulator, if
a matching supply is specified but unavailable the regulator core will
return an error.

Based on this we should not ignore errors upon failing to acquire the
optional "vddp-ref-clk" supply.

Reviewed-by: default avatarVivek Gautam <vivek.gautam@codeaurora.org>
Reviewed-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent e7d5e412

drivers/phy/phy-qcom-ufs.c

+7 −14
Original line number Original line Diff line number Diff line
@@ -210,8 +210,9 @@ int ufs_qcom_phy_init_clks(struct ufs_qcom_phy *phy_common) 
}

}

EXPORT_SYMBOL_GPL(ufs_qcom_phy_init_clks);

EXPORT_SYMBOL_GPL(ufs_qcom_phy_init_clks);





static int __ufs_qcom_phy_init_vreg(struct device *dev,

static int ufs_qcom_phy_init_vreg(struct device *dev,

		struct ufs_qcom_phy_vreg *vreg, const char *name, bool optional)

				  struct ufs_qcom_phy_vreg *vreg,

				  const char *name)

{

{

	int err = 0;

	int err = 0;
@@ -221,8 +222,6 @@ static int __ufs_qcom_phy_init_vreg(struct device *dev, 
	vreg->reg = devm_regulator_get(dev, name);

	vreg->reg = devm_regulator_get(dev, name);

	if (IS_ERR(vreg->reg)) {

	if (IS_ERR(vreg->reg)) {

		err = PTR_ERR(vreg->reg);

		err = PTR_ERR(vreg->reg);

		vreg->reg = NULL;

		if (!optional)

		dev_err(dev, "failed to get %s, %d\n", name, err);

		dev_err(dev, "failed to get %s, %d\n", name, err);

		goto out;

		goto out;

	}

	}
@@ -263,12 +262,6 @@ static int __ufs_qcom_phy_init_vreg(struct device *dev, 
	return err;

	return err;

}

}





static int ufs_qcom_phy_init_vreg(struct device *dev,

			struct ufs_qcom_phy_vreg *vreg, const char *name)

{

	return __ufs_qcom_phy_init_vreg(dev, vreg, name, false);

}



int ufs_qcom_phy_init_vregulators(struct ufs_qcom_phy *phy_common)

int ufs_qcom_phy_init_vregulators(struct ufs_qcom_phy *phy_common)

{

{

	int err;

	int err;
@@ -284,9 +277,9 @@ int ufs_qcom_phy_init_vregulators(struct ufs_qcom_phy *phy_common) 
	if (err)

	if (err)

		goto out;

		goto out;





	/* vddp-ref-clk-* properties are optional */

	err = ufs_qcom_phy_init_vreg(phy_common->dev, &phy_common->vddp_ref_clk,

	__ufs_qcom_phy_init_vreg(phy_common->dev, &phy_common->vddp_ref_clk,

				     "vddp-ref-clk");

				 "vddp-ref-clk", true);



out:

out:

	return err;

	return err;

}

}