All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vaishali Thakkar <vaishali.thakkar@oracle.com>
To: Eric Engestrom <eric.engestrom@imgtec.com>
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/msm: Move call to PTR_ERR_OR_ZERO after reassignment
Date: Thu, 28 Apr 2016 18:53:27 +0530	[thread overview]
Message-ID: <57220ECF.5000005@oracle.com> (raw)
In-Reply-To: <20160428125301.GY32731@imgtec.com>



On Thursday 28 April 2016 06:23 PM, Eric Engestrom wrote:
> On Wed, Apr 27, 2016 at 04:51:37PM +0530, Vaishali Thakkar wrote:
>> Here, a location is reset to NULL before being passed to PTR_ERR.
>> So, PTR_ERR should be called before its argument is reassigned
>> to NULL. Further to simplify things use PTR_ERR_OR_ZERO instead
>> of PTR_ERR and IS_ERR.
>>
>> Problem found using Coccinelle.
>>
>> Signed-off-by: Vaishali Thakkar <vaishali.thakkar@oracle.com>
>> ---
>>  drivers/gpu/drm/msm/edp/edp_ctrl.c | 16 +++++++++-------
>>  1 file changed, 9 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c
>> index 81200e9..7816541 100644
>> --- a/drivers/gpu/drm/msm/edp/edp_ctrl.c
>> +++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c
>> @@ -302,21 +302,23 @@ static void edp_clk_disable(struct edp_ctrl *ctrl, u32 clk_mask)
>>  static int edp_regulator_init(struct edp_ctrl *ctrl)
>>  {
>>  	struct device *dev = &ctrl->pdev->dev;
>> +	int ret;
>>  
>>  	DBG("");
>>  	ctrl->vdda_vreg = devm_regulator_get(dev, "vdda");
>> -	if (IS_ERR(ctrl->vdda_vreg)) {
>> +	ret = PTR_ERR_OR_ZERO(ctrl->vdda_vreg);
>> +	if (ret) {
>>  		pr_err("%s: Could not get vdda reg, ret = %ld\n", __func__,
>> -				PTR_ERR(ctrl->vdda_vreg));
>> +				ret);
>>  		ctrl->vdda_vreg = NULL;
>> -		return PTR_ERR(ctrl->vdda_vreg);
>> +		return ret;
>>  	}
>>  	ctrl->lvl_vreg = devm_regulator_get(dev, "lvl-vdd");
>> -	if (IS_ERR(ctrl->lvl_vreg)) {
>> -		pr_err("Could not get lvl-vdd reg, %ld",
>> -				PTR_ERR(ctrl->lvl_vreg));
>> +	ret = PTR_ERR_OR_ZERO(ctrl->lvl_vreg);
>> +	if (ret) {
> 
> While you're rewriting them, it might be worth making these two pr_err()
> print the same format, e.g.:
> 
> 	pr_err("%s: Could not get lvl-vdd reg, ret = %ld\n", __func__, ret);

Done, thanks.

>> +		pr_err("Could not get lvl-vdd reg, %ld", ret);
>>  		ctrl->lvl_vreg = NULL;
>> -		return PTR_ERR(ctrl->lvl_vreg);
>> +		return ret;
>>  	}
>>  
>>  	return 0;
>> -- 
>> 2.1.4
> 
> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
> 

-- 
Vaishali
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

WARNING: multiple messages have this Message-ID (diff)
From: Vaishali Thakkar <vaishali.thakkar@oracle.com>
To: Eric Engestrom <eric.engestrom@imgtec.com>
Cc: airlied@linux.ie, linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm/msm: Move call to PTR_ERR_OR_ZERO after reassignment
Date: Thu, 28 Apr 2016 18:53:27 +0530	[thread overview]
Message-ID: <57220ECF.5000005@oracle.com> (raw)
In-Reply-To: <20160428125301.GY32731@imgtec.com>



On Thursday 28 April 2016 06:23 PM, Eric Engestrom wrote:
> On Wed, Apr 27, 2016 at 04:51:37PM +0530, Vaishali Thakkar wrote:
>> Here, a location is reset to NULL before being passed to PTR_ERR.
>> So, PTR_ERR should be called before its argument is reassigned
>> to NULL. Further to simplify things use PTR_ERR_OR_ZERO instead
>> of PTR_ERR and IS_ERR.
>>
>> Problem found using Coccinelle.
>>
>> Signed-off-by: Vaishali Thakkar <vaishali.thakkar@oracle.com>
>> ---
>>  drivers/gpu/drm/msm/edp/edp_ctrl.c | 16 +++++++++-------
>>  1 file changed, 9 insertions(+), 7 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/msm/edp/edp_ctrl.c b/drivers/gpu/drm/msm/edp/edp_ctrl.c
>> index 81200e9..7816541 100644
>> --- a/drivers/gpu/drm/msm/edp/edp_ctrl.c
>> +++ b/drivers/gpu/drm/msm/edp/edp_ctrl.c
>> @@ -302,21 +302,23 @@ static void edp_clk_disable(struct edp_ctrl *ctrl, u32 clk_mask)
>>  static int edp_regulator_init(struct edp_ctrl *ctrl)
>>  {
>>  	struct device *dev = &ctrl->pdev->dev;
>> +	int ret;
>>  
>>  	DBG("");
>>  	ctrl->vdda_vreg = devm_regulator_get(dev, "vdda");
>> -	if (IS_ERR(ctrl->vdda_vreg)) {
>> +	ret = PTR_ERR_OR_ZERO(ctrl->vdda_vreg);
>> +	if (ret) {
>>  		pr_err("%s: Could not get vdda reg, ret = %ld\n", __func__,
>> -				PTR_ERR(ctrl->vdda_vreg));
>> +				ret);
>>  		ctrl->vdda_vreg = NULL;
>> -		return PTR_ERR(ctrl->vdda_vreg);
>> +		return ret;
>>  	}
>>  	ctrl->lvl_vreg = devm_regulator_get(dev, "lvl-vdd");
>> -	if (IS_ERR(ctrl->lvl_vreg)) {
>> -		pr_err("Could not get lvl-vdd reg, %ld",
>> -				PTR_ERR(ctrl->lvl_vreg));
>> +	ret = PTR_ERR_OR_ZERO(ctrl->lvl_vreg);
>> +	if (ret) {
> 
> While you're rewriting them, it might be worth making these two pr_err()
> print the same format, e.g.:
> 
> 	pr_err("%s: Could not get lvl-vdd reg, ret = %ld\n", __func__, ret);

Done, thanks.

>> +		pr_err("Could not get lvl-vdd reg, %ld", ret);
>>  		ctrl->lvl_vreg = NULL;
>> -		return PTR_ERR(ctrl->lvl_vreg);
>> +		return ret;
>>  	}
>>  
>>  	return 0;
>> -- 
>> 2.1.4
> 
> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
> 

-- 
Vaishali

  reply	other threads:[~2016-04-28 13:23 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-27 11:21 [PATCH] drm/msm: Move call to PTR_ERR_OR_ZERO after reassignment Vaishali Thakkar
2016-04-27 11:21 ` Vaishali Thakkar
2016-04-28 12:53 ` Eric Engestrom
2016-04-28 12:53   ` Eric Engestrom
2016-04-28 13:23   ` Vaishali Thakkar [this message]
2016-04-28 13:23     ` Vaishali Thakkar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=57220ECF.5000005@oracle.com \
    --to=vaishali.thakkar@oracle.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=eric.engestrom@imgtec.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.