| Message ID | 20170122211749.22803-4-bjorn.andersson@linaro.org |
|---|---|
| State | Accepted |
| Commit | 42020c70656f9966e9ed83f9fe67369b0abf75e8 |
| Headers | show |
| Series | [v2,1/4] phy: qcom-ufs: Don't kfree devres resource | expand |
On Monday 23 January 2017 02:47 AM, Bjorn Andersson wrote: > The error paths of the common qcom-ufs functions for registering the > phy, acquiring clocks and acquiring regulators all print specific error > messages before returning an error, so there is no value in printing yet > another - more generic - message when this occur. > > Reviewed-by: Vivek Gautam <vivek.gautam@codeaurora.org> > Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> merged the series, thanks. -Kishon > --- > > Changes since v1: > - Picked up reviewed-bys from Vivek and Subhash > > drivers/phy/phy-qcom-ufs-qmp-14nm.c | 15 +++------------ > drivers/phy/phy-qcom-ufs-qmp-20nm.c | 12 ++---------- > 2 files changed, 5 insertions(+), 22 deletions(-) > > diff --git a/drivers/phy/phy-qcom-ufs-qmp-14nm.c b/drivers/phy/phy-qcom-ufs-qmp-14nm.c > index c71c84734916..12a1b498dc4b 100644 > --- a/drivers/phy/phy-qcom-ufs-qmp-14nm.c > +++ b/drivers/phy/phy-qcom-ufs-qmp-14nm.c > @@ -132,27 +132,18 @@ static int ufs_qcom_phy_qmp_14nm_probe(struct platform_device *pdev) > &ufs_qcom_phy_qmp_14nm_phy_ops, &phy_14nm_ops); > > if (!generic_phy) { > - dev_err(dev, "%s: ufs_qcom_phy_generic_probe() failed\n", > - __func__); > err = -EIO; > goto out; > } > > err = ufs_qcom_phy_init_clks(phy_common); > - if (err) { > - dev_err(phy_common->dev, > - "%s: ufs_qcom_phy_init_clks() failed %d\n", > - __func__, err); > + if (err) > goto out; > - } > > err = ufs_qcom_phy_init_vregulators(phy_common); > - if (err) { > - dev_err(phy_common->dev, > - "%s: ufs_qcom_phy_init_vregulators() failed %d\n", > - __func__, err); > + if (err) > goto out; > - } > + > phy_common->vdda_phy.max_uV = UFS_PHY_VDDA_PHY_UV; > phy_common->vdda_phy.min_uV = UFS_PHY_VDDA_PHY_UV; > > diff --git a/drivers/phy/phy-qcom-ufs-qmp-20nm.c b/drivers/phy/phy-qcom-ufs-qmp-20nm.c > index 1a26a64e06d3..4f68acb58b73 100644 > --- a/drivers/phy/phy-qcom-ufs-qmp-20nm.c > +++ b/drivers/phy/phy-qcom-ufs-qmp-20nm.c > @@ -190,25 +190,17 @@ static int ufs_qcom_phy_qmp_20nm_probe(struct platform_device *pdev) > &ufs_qcom_phy_qmp_20nm_phy_ops, &phy_20nm_ops); > > if (!generic_phy) { > - dev_err(dev, "%s: ufs_qcom_phy_generic_probe() failed\n", > - __func__); > err = -EIO; > goto out; > } > > err = ufs_qcom_phy_init_clks(phy_common); > - if (err) { > - dev_err(phy_common->dev, "%s: ufs_qcom_phy_init_clks() failed %d\n", > - __func__, err); > + if (err) > goto out; > - } > > err = ufs_qcom_phy_init_vregulators(phy_common); > - if (err) { > - dev_err(phy_common->dev, "%s: ufs_qcom_phy_init_vregulators() failed %d\n", > - __func__, err); > + if (err) > goto out; > - } > > ufs_qcom_phy_qmp_20nm_advertise_quirks(phy_common); > > -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/phy/phy-qcom-ufs-qmp-14nm.c b/drivers/phy/phy-qcom-ufs-qmp-14nm.c index c71c84734916..12a1b498dc4b 100644 --- a/drivers/phy/phy-qcom-ufs-qmp-14nm.c +++ b/drivers/phy/phy-qcom-ufs-qmp-14nm.c @@ -132,27 +132,18 @@ static int ufs_qcom_phy_qmp_14nm_probe(struct platform_device *pdev) &ufs_qcom_phy_qmp_14nm_phy_ops, &phy_14nm_ops); if (!generic_phy) { - dev_err(dev, "%s: ufs_qcom_phy_generic_probe() failed\n", - __func__); err = -EIO; goto out; } err = ufs_qcom_phy_init_clks(phy_common); - if (err) { - dev_err(phy_common->dev, - "%s: ufs_qcom_phy_init_clks() failed %d\n", - __func__, err); + if (err) goto out; - } err = ufs_qcom_phy_init_vregulators(phy_common); - if (err) { - dev_err(phy_common->dev, - "%s: ufs_qcom_phy_init_vregulators() failed %d\n", - __func__, err); + if (err) goto out; - } + phy_common->vdda_phy.max_uV = UFS_PHY_VDDA_PHY_UV; phy_common->vdda_phy.min_uV = UFS_PHY_VDDA_PHY_UV; diff --git a/drivers/phy/phy-qcom-ufs-qmp-20nm.c b/drivers/phy/phy-qcom-ufs-qmp-20nm.c index 1a26a64e06d3..4f68acb58b73 100644 --- a/drivers/phy/phy-qcom-ufs-qmp-20nm.c +++ b/drivers/phy/phy-qcom-ufs-qmp-20nm.c @@ -190,25 +190,17 @@ static int ufs_qcom_phy_qmp_20nm_probe(struct platform_device *pdev) &ufs_qcom_phy_qmp_20nm_phy_ops, &phy_20nm_ops); if (!generic_phy) { - dev_err(dev, "%s: ufs_qcom_phy_generic_probe() failed\n", - __func__); err = -EIO; goto out; } err = ufs_qcom_phy_init_clks(phy_common); - if (err) { - dev_err(phy_common->dev, "%s: ufs_qcom_phy_init_clks() failed %d\n", - __func__, err); + if (err) goto out; - } err = ufs_qcom_phy_init_vregulators(phy_common); - if (err) { - dev_err(phy_common->dev, "%s: ufs_qcom_phy_init_vregulators() failed %d\n", - __func__, err); + if (err) goto out; - } ufs_qcom_phy_qmp_20nm_advertise_quirks(phy_common);