From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Engestrom Subject: Re: [PATCH] drm/msm: Move call to PTR_ERR_OR_ZERO after reassignment Date: Thu, 28 Apr 2016 13:53:01 +0100 Message-ID: <20160428125301.GY32731@imgtec.com> References: <1461756097-20799-1-git-send-email-vaishali.thakkar@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by gabe.freedesktop.org (Postfix) with ESMTP id 261726ECE0 for ; Thu, 28 Apr 2016 12:52:36 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1461756097-20799-1-git-send-email-vaishali.thakkar@oracle.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Vaishali Thakkar Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBBcHIgMjcsIDIwMTYgYXQgMDQ6NTE6MzdQTSArMDUzMCwgVmFpc2hhbGkgVGhha2th ciB3cm90ZToKPiBIZXJlLCBhIGxvY2F0aW9uIGlzIHJlc2V0IHRvIE5VTEwgYmVmb3JlIGJlaW5n IHBhc3NlZCB0byBQVFJfRVJSLgo+IFNvLCBQVFJfRVJSIHNob3VsZCBiZSBjYWxsZWQgYmVmb3Jl IGl0cyBhcmd1bWVudCBpcyByZWFzc2lnbmVkCj4gdG8gTlVMTC4gRnVydGhlciB0byBzaW1wbGlm eSB0aGluZ3MgdXNlIFBUUl9FUlJfT1JfWkVSTyBpbnN0ZWFkCj4gb2YgUFRSX0VSUiBhbmQgSVNf RVJSLgo+IAo+IFByb2JsZW0gZm91bmQgdXNpbmcgQ29jY2luZWxsZS4KPiAKPiBTaWduZWQtb2Zm LWJ5OiBWYWlzaGFsaSBUaGFra2FyIDx2YWlzaGFsaS50aGFra2FyQG9yYWNsZS5jb20+Cj4gLS0t Cj4gIGRyaXZlcnMvZ3B1L2RybS9tc20vZWRwL2VkcF9jdHJsLmMgfCAxNiArKysrKysrKystLS0t LS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDcgZGVsZXRpb25zKC0pCj4g Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tc20vZWRwL2VkcF9jdHJsLmMgYi9kcml2 ZXJzL2dwdS9kcm0vbXNtL2VkcC9lZHBfY3RybC5jCj4gaW5kZXggODEyMDBlOS4uNzgxNjU0MSAx MDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vbXNtL2VkcC9lZHBfY3RybC5jCj4gKysrIGIv ZHJpdmVycy9ncHUvZHJtL21zbS9lZHAvZWRwX2N0cmwuYwo+IEBAIC0zMDIsMjEgKzMwMiwyMyBA QCBzdGF0aWMgdm9pZCBlZHBfY2xrX2Rpc2FibGUoc3RydWN0IGVkcF9jdHJsICpjdHJsLCB1MzIg Y2xrX21hc2spCj4gIHN0YXRpYyBpbnQgZWRwX3JlZ3VsYXRvcl9pbml0KHN0cnVjdCBlZHBfY3Ry bCAqY3RybCkKPiAgewo+ICAJc3RydWN0IGRldmljZSAqZGV2ID0gJmN0cmwtPnBkZXYtPmRldjsK PiArCWludCByZXQ7Cj4gIAo+ICAJREJHKCIiKTsKPiAgCWN0cmwtPnZkZGFfdnJlZyA9IGRldm1f cmVndWxhdG9yX2dldChkZXYsICJ2ZGRhIik7Cj4gLQlpZiAoSVNfRVJSKGN0cmwtPnZkZGFfdnJl ZykpIHsKPiArCXJldCA9IFBUUl9FUlJfT1JfWkVSTyhjdHJsLT52ZGRhX3ZyZWcpOwo+ICsJaWYg KHJldCkgewo+ICAJCXByX2VycigiJXM6IENvdWxkIG5vdCBnZXQgdmRkYSByZWcsIHJldCA9ICVs ZFxuIiwgX19mdW5jX18sCj4gLQkJCQlQVFJfRVJSKGN0cmwtPnZkZGFfdnJlZykpOwo+ICsJCQkJ cmV0KTsKPiAgCQljdHJsLT52ZGRhX3ZyZWcgPSBOVUxMOwo+IC0JCXJldHVybiBQVFJfRVJSKGN0 cmwtPnZkZGFfdnJlZyk7Cj4gKwkJcmV0dXJuIHJldDsKPiAgCX0KPiAgCWN0cmwtPmx2bF92cmVn ID0gZGV2bV9yZWd1bGF0b3JfZ2V0KGRldiwgImx2bC12ZGQiKTsKPiAtCWlmIChJU19FUlIoY3Ry bC0+bHZsX3ZyZWcpKSB7Cj4gLQkJcHJfZXJyKCJDb3VsZCBub3QgZ2V0IGx2bC12ZGQgcmVnLCAl bGQiLAo+IC0JCQkJUFRSX0VSUihjdHJsLT5sdmxfdnJlZykpOwo+ICsJcmV0ID0gUFRSX0VSUl9P Ul9aRVJPKGN0cmwtPmx2bF92cmVnKTsKPiArCWlmIChyZXQpIHsKCldoaWxlIHlvdSdyZSByZXdy aXRpbmcgdGhlbSwgaXQgbWlnaHQgYmUgd29ydGggbWFraW5nIHRoZXNlIHR3byBwcl9lcnIoKQpw cmludCB0aGUgc2FtZSBmb3JtYXQsIGUuZy46CgoJcHJfZXJyKCIlczogQ291bGQgbm90IGdldCBs dmwtdmRkIHJlZywgcmV0ID0gJWxkXG4iLCBfX2Z1bmNfXywgcmV0KTsKCj4gKwkJcHJfZXJyKCJD b3VsZCBub3QgZ2V0IGx2bC12ZGQgcmVnLCAlbGQiLCByZXQpOwo+ICAJCWN0cmwtPmx2bF92cmVn ID0gTlVMTDsKPiAtCQlyZXR1cm4gUFRSX0VSUihjdHJsLT5sdmxfdnJlZyk7Cj4gKwkJcmV0dXJu IHJldDsKPiAgCX0KPiAgCj4gIAlyZXR1cm4gMDsKPiAtLSAKPiAyLjEuNAoKUmV2aWV3ZWQtYnk6 IEVyaWMgRW5nZXN0cm9tIDxlcmljLmVuZ2VzdHJvbUBpbWd0ZWMuY29tPgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0 CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3Rv cC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751578AbcD1Mwi (ORCPT ); Thu, 28 Apr 2016 08:52:38 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:24128 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750809AbcD1Mwh (ORCPT ); Thu, 28 Apr 2016 08:52:37 -0400 Date: Thu, 28 Apr 2016 13:53:01 +0100 From: Eric Engestrom To: Vaishali Thakkar CC: , , Subject: Re: [PATCH] drm/msm: Move call to PTR_ERR_OR_ZERO after reassignment Message-ID: <20160428125301.GY32731@imgtec.com> References: <1461756097-20799-1-git-send-email-vaishali.thakkar@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline In-Reply-To: <1461756097-20799-1-git-send-email-vaishali.thakkar@oracle.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Originating-IP: [10.60.4.28] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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); > + 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