Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1564687 > unrolled thread

[PATCH v2 1/4] phy: qcom-ufs: Don't kfree devres resource

Back to article view | Back to linux.kernel

Contents

  [PATCH v2 1/4] phy: qcom-ufs: Don't kfree devres resource Bjorn Andersson <bjorn.andersson@linaro.org> - 2017-01-23 06:20 +0100
    [PATCH v2 4/4] phy: qcom-ufs: Suppress extraneous logging Bjorn Andersson <bjorn.andersson@linaro.org> - 2017-01-23 06:20 +0100
      Re: [PATCH v2 4/4] phy: qcom-ufs: Suppress extraneous logging Kishon Vijay Abraham I <kishon@ti.com> - 2017-01-26 16:30 +0100

#1564687 — [PATCH v2 1/4] phy: qcom-ufs: Don't kfree devres resource

Upon failing to acquire regulator supplies the qcom-ufs driver calls
kfree() on the devm allocated memory used to store the name of the
regulator, leading to devres corruption.

Rather than switching to using the appropriate free function the patch
acknowledge the fact that "name" is always a constant string and we
don't actually need to create a local copy of it, but rather just
reference the constant string.

Fixes: add78fc05702 ("phy: qcom-ufs: Use devm sibling of kstrdup for regulator names")
Cc: stable@vger.kernel.org
Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---

Changes since v1:
- Added fixes and Cc: stable@
- Added Subhash's reviewed-by

 drivers/phy/phy-qcom-ufs.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c
index c69568b8543d..4d7f3c018223 100644
--- a/drivers/phy/phy-qcom-ufs.c
+++ b/drivers/phy/phy-qcom-ufs.c
@@ -217,12 +217,7 @@ static int __ufs_qcom_phy_init_vreg(struct device *dev,
 
 	char prop_name[MAX_PROP_NAME];
 
-	vreg->name = devm_kstrdup(dev, name, GFP_KERNEL);
-	if (!vreg->name) {
-		err = -ENOMEM;
-		goto out;
-	}
-
+	vreg->name = name;
 	vreg->reg = devm_regulator_get(dev, name);
 	if (IS_ERR(vreg->reg)) {
 		err = PTR_ERR(vreg->reg);
@@ -265,8 +260,6 @@ static int __ufs_qcom_phy_init_vreg(struct device *dev,
 	}
 
 out:
-	if (err)
-		kfree(vreg->name);
 	return err;
 }
 
-- 
2.11.0

[toc] | [next] | [standalone]

#1564688 — [PATCH v2 4/4] phy: qcom-ufs: Suppress extraneous logging

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>
---

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);
 
-- 
2.11.0

[toc] | [prev] | [next] | [standalone]

#1567515 — Re: [PATCH v2 4/4] phy: qcom-ufs: Suppress extraneous logging

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);
>  
> 

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web