From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Sinclair Yeh" Subject: Re: [PATCH 04/15] drivers: gpu: Drop unlikely before IS_ERR(_OR_NULL) Date: Fri, 31 Jul 2015 08:53:04 -0700 Message-ID: <20150731155228.GA18431@syeh-linux> References: <1b19585aab58d665973c475677ce5a80fc6aa48c.1438331416.git.viresh.kumar@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp-outbound-1.vmware.com (smtp-outbound-1.vmware.com [208.91.2.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7440B6E0B4 for ; Fri, 31 Jul 2015 08:52:39 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1b19585aab58d665973c475677ce5a80fc6aa48c.1438331416.git.viresh.kumar@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Viresh Kumar Cc: Thomas Hellstrom , linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, "open list:DRM DRIVERS" , Ben Skeggs , akpm@linux-foundation.org List-Id: dri-devel@lists.freedesktop.org VGhpcyBwYXRjaDogIFJldmlld2VkLWJ5OiBTaW5jbGFpciBZZWggPHN5ZWhAdm13YXJlLmNvbT4K Ck9uIEZyaSwgSnVsIDMxLCAyMDE1IGF0IDAyOjA4OjI0UE0gKzA1MzAsIFZpcmVzaCBLdW1hciB3 cm90ZToKPiBJU19FUlIoX09SX05VTEwpIGFscmVhZHkgY29udGFpbiBhbiAndW5saWtlbHknIGNv bXBpbGVyIGZsYWcgYW5kIHRoZXJlCj4gaXMgbm8gbmVlZCB0byBkbyB0aGF0IGFnYWluIGZyb20g aXRzIGNhbGxlcnMuIERyb3AgaXQuCj4gCj4gU2lnbmVkLW9mZi1ieTogVmlyZXNoIEt1bWFyIDx2 aXJlc2gua3VtYXJAbGluYXJvLm9yZz4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL3R0bS90dG1f dHQuYyAgICAgICAgICAgIHwgNCArKy0tCj4gIGRyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4 X2NvbnRleHQuYyB8IDIgKy0KPiAgZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZHJ2LmMg ICAgIHwgMiArLQo+ICAzIGZpbGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlv bnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fdHQuYyBiL2Ry aXZlcnMvZ3B1L2RybS90dG0vdHRtX3R0LmMKPiBpbmRleCBiZjA4MGFiYzg2ZDEuLjRlMTlkMGY5 Y2MzMCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vdHRtL3R0bV90dC5jCj4gKysrIGIv ZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fdHQuYwo+IEBAIC0zNDAsNyArMzQwLDcgQEAgaW50IHR0 bV90dF9zd2Fwb3V0KHN0cnVjdCB0dG1fdHQgKnR0bSwgc3RydWN0IGZpbGUgKnBlcnNpc3RlbnRf c3dhcF9zdG9yYWdlKQo+ICAJCXN3YXBfc3RvcmFnZSA9IHNobWVtX2ZpbGVfc2V0dXAoInR0bSBz d2FwIiwKPiAgCQkJCQkJdHRtLT5udW1fcGFnZXMgPDwgUEFHRV9TSElGVCwKPiAgCQkJCQkJMCk7 Cj4gLQkJaWYgKHVubGlrZWx5KElTX0VSUihzd2FwX3N0b3JhZ2UpKSkgewo+ICsJCWlmIChJU19F UlIoc3dhcF9zdG9yYWdlKSkgewo+ICAJCQlwcl9lcnIoIkZhaWxlZCBhbGxvY2F0aW5nIHN3YXAg c3RvcmFnZVxuIik7Cj4gIAkJCXJldHVybiBQVFJfRVJSKHN3YXBfc3RvcmFnZSk7Cj4gIAkJfQo+ IEBAIC0zNTQsNyArMzU0LDcgQEAgaW50IHR0bV90dF9zd2Fwb3V0KHN0cnVjdCB0dG1fdHQgKnR0 bSwgc3RydWN0IGZpbGUgKnBlcnNpc3RlbnRfc3dhcF9zdG9yYWdlKQo+ICAJCWlmICh1bmxpa2Vs eShmcm9tX3BhZ2UgPT0gTlVMTCkpCj4gIAkJCWNvbnRpbnVlOwo+ICAJCXRvX3BhZ2UgPSBzaG1l bV9yZWFkX21hcHBpbmdfcGFnZShzd2FwX3NwYWNlLCBpKTsKPiAtCQlpZiAodW5saWtlbHkoSVNf RVJSKHRvX3BhZ2UpKSkgewo+ICsJCWlmIChJU19FUlIodG9fcGFnZSkpIHsKPiAgCQkJcmV0ID0g UFRSX0VSUih0b19wYWdlKTsKPiAgCQkJZ290byBvdXRfZXJyOwo+ICAJCX0KPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfY29udGV4dC5jIGIvZHJpdmVycy9ncHUv ZHJtL3Ztd2dmeC92bXdnZnhfY29udGV4dC5jCj4gaW5kZXggNWFjOTI4NzQ0MDRkLi40NGU2ZWNi YTNkZTcgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfY29udGV4 dC5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfY29udGV4dC5jCj4gQEAg LTE1OSw3ICsxNTksNyBAQCBzdGF0aWMgaW50IHZtd19nYl9jb250ZXh0X2luaXQoc3RydWN0IHZt d19wcml2YXRlICpkZXZfcHJpdiwKPiAgCj4gIAlpZiAoZGV2X3ByaXYtPmhhc19tb2IpIHsKPiAg CQl1Y3R4LT5tYW4gPSB2bXdfY21kYnVmX3Jlc19tYW5fY3JlYXRlKGRldl9wcml2KTsKPiAtCQlp ZiAodW5saWtlbHkoSVNfRVJSKHVjdHgtPm1hbikpKSB7Cj4gKwkJaWYgKElTX0VSUih1Y3R4LT5t YW4pKSB7Cj4gIAkJCXJldCA9IFBUUl9FUlIodWN0eC0+bWFuKTsKPiAgCQkJdWN0eC0+bWFuID0g TlVMTDsKPiAgCQkJZ290byBvdXRfZXJyOwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v dm13Z2Z4L3Ztd2dmeF9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X2Rydi5j Cj4gaW5kZXggNjIwYmI1Y2Y2MTdjLi42MjE4YTM2Y2YwMWEgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVy cy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZHJ2LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13 Z2Z4L3Ztd2dmeF9kcnYuYwo+IEBAIC0xMDU0LDcgKzEwNTQsNyBAQCBzdGF0aWMgbG9uZyB2bXdf Z2VuZXJpY19pb2N0bChzdHJ1Y3QgZmlsZSAqZmlscCwgdW5zaWduZWQgaW50IGNtZCwKPiAgCQly ZXR1cm4gLUVJTlZBTDsKPiAgCj4gIAl2bWFzdGVyID0gdm13X21hc3Rlcl9jaGVjayhkZXYsIGZp bGVfcHJpdiwgZmxhZ3MpOwo+IC0JaWYgKHVubGlrZWx5KElTX0VSUih2bWFzdGVyKSkpIHsKPiAr CWlmIChJU19FUlIodm1hc3RlcikpIHsKPiAgCQlyZXQgPSBQVFJfRVJSKHZtYXN0ZXIpOwo+ICAK PiAgCQlpZiAocmV0ICE9IC1FUkVTVEFSVFNZUykKPiAtLSAKPiAyLjQuMAo+IApfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBs aXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752211AbbGaPwk (ORCPT ); Fri, 31 Jul 2015 11:52:40 -0400 Received: from smtp-outbound-1.vmware.com ([208.91.2.12]:42417 "EHLO smtp-outbound-1.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751140AbbGaPwj (ORCPT ); Fri, 31 Jul 2015 11:52:39 -0400 From: "Sinclair Yeh" Date: Fri, 31 Jul 2015 08:53:04 -0700 To: Viresh Kumar Cc: akpm@linux-foundation.org, linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, Alexandre Courbot , Ben Skeggs , Dave Airlie , David Airlie , David Herrmann , "open list:DRM DRIVERS" , Thomas Hellstrom Subject: Re: [PATCH 04/15] drivers: gpu: Drop unlikely before IS_ERR(_OR_NULL) Message-ID: <20150731155228.GA18431@syeh-linux> References: <1b19585aab58d665973c475677ce5a80fc6aa48c.1438331416.git.viresh.kumar@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1b19585aab58d665973c475677ce5a80fc6aa48c.1438331416.git.viresh.kumar@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch: Reviewed-by: Sinclair Yeh On Fri, Jul 31, 2015 at 02:08:24PM +0530, Viresh Kumar wrote: > IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there > is no need to do that again from its callers. Drop it. > > Signed-off-by: Viresh Kumar > --- > drivers/gpu/drm/ttm/ttm_tt.c | 4 ++-- > drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c > index bf080abc86d1..4e19d0f9cc30 100644 > --- a/drivers/gpu/drm/ttm/ttm_tt.c > +++ b/drivers/gpu/drm/ttm/ttm_tt.c > @@ -340,7 +340,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage) > swap_storage = shmem_file_setup("ttm swap", > ttm->num_pages << PAGE_SHIFT, > 0); > - if (unlikely(IS_ERR(swap_storage))) { > + if (IS_ERR(swap_storage)) { > pr_err("Failed allocating swap storage\n"); > return PTR_ERR(swap_storage); > } > @@ -354,7 +354,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage) > if (unlikely(from_page == NULL)) > continue; > to_page = shmem_read_mapping_page(swap_space, i); > - if (unlikely(IS_ERR(to_page))) { > + if (IS_ERR(to_page)) { > ret = PTR_ERR(to_page); > goto out_err; > } > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c > index 5ac92874404d..44e6ecba3de7 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c > @@ -159,7 +159,7 @@ static int vmw_gb_context_init(struct vmw_private *dev_priv, > > if (dev_priv->has_mob) { > uctx->man = vmw_cmdbuf_res_man_create(dev_priv); > - if (unlikely(IS_ERR(uctx->man))) { > + if (IS_ERR(uctx->man)) { > ret = PTR_ERR(uctx->man); > uctx->man = NULL; > goto out_err; > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > index 620bb5cf617c..6218a36cf01a 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c > @@ -1054,7 +1054,7 @@ static long vmw_generic_ioctl(struct file *filp, unsigned int cmd, > return -EINVAL; > > vmaster = vmw_master_check(dev, file_priv, flags); > - if (unlikely(IS_ERR(vmaster))) { > + if (IS_ERR(vmaster)) { > ret = PTR_ERR(vmaster); > > if (ret != -ERESTARTSYS) > -- > 2.4.0 >