From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 04/15] drivers: gpu: Drop unlikely before IS_ERR(_OR_NULL) Date: Mon, 3 Aug 2015 10:01:26 +0200 Message-ID: <20150803080126.GA24689@phenom.ffwll.local> References: <1b19585aab58d665973c475677ce5a80fc6aa48c.1438331416.git.viresh.kumar@linaro.org> <20150731155228.GA18431@syeh-linux> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id EC0BD6E348 for ; Mon, 3 Aug 2015 01:01:34 -0700 (PDT) Received: by wicgj17 with SMTP id gj17so93100120wic.1 for ; Mon, 03 Aug 2015 01:01:33 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20150731155228.GA18431@syeh-linux> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Sinclair Yeh Cc: Thomas Hellstrom , linaro-kernel@lists.linaro.org, Viresh Kumar , linux-kernel@vger.kernel.org, "open list:DRM DRIVERS" , Ben Skeggs , akpm@linux-foundation.org List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBKdWwgMzEsIDIwMTUgYXQgMDg6NTM6MDRBTSAtMDcwMCwgU2luY2xhaXIgWWVoIHdy b3RlOgo+IFRoaXMgcGF0Y2g6ICBSZXZpZXdlZC1ieTogU2luY2xhaXIgWWVoIDxzeWVoQHZtd2Fy ZS5jb20+Cj4gCj4gT24gRnJpLCBKdWwgMzEsIDIwMTUgYXQgMDI6MDg6MjRQTSArMDUzMCwgVmly ZXNoIEt1bWFyIHdyb3RlOgo+ID4gSVNfRVJSKF9PUl9OVUxMKSBhbHJlYWR5IGNvbnRhaW4gYW4g J3VubGlrZWx5JyBjb21waWxlciBmbGFnIGFuZCB0aGVyZQo+ID4gaXMgbm8gbmVlZCB0byBkbyB0 aGF0IGFnYWluIGZyb20gaXRzIGNhbGxlcnMuIERyb3AgaXQuCj4gPiAKPiA+IFNpZ25lZC1vZmYt Ynk6IFZpcmVzaCBLdW1hciA8dmlyZXNoLmt1bWFyQGxpbmFyby5vcmc+CgpBcHBsaWVkIHRvIGRy bS1taXNjLCB0aGFua3MuCi1EYW5pZWwKCj4gPiAtLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vdHRt L3R0bV90dC5jICAgICAgICAgICAgfCA0ICsrLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vdm13Z2Z4 L3Ztd2dmeF9jb250ZXh0LmMgfCAyICstCj4gPiAgZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdn ZnhfZHJ2LmMgICAgIHwgMiArLQo+ID4gIDMgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCsp LCA0IGRlbGV0aW9ucygtKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3R0 bS90dG1fdHQuYyBiL2RyaXZlcnMvZ3B1L2RybS90dG0vdHRtX3R0LmMKPiA+IGluZGV4IGJmMDgw YWJjODZkMS4uNGUxOWQwZjljYzMwIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3R0 bS90dG1fdHQuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3R0bS90dG1fdHQuYwo+ID4gQEAg LTM0MCw3ICszNDAsNyBAQCBpbnQgdHRtX3R0X3N3YXBvdXQoc3RydWN0IHR0bV90dCAqdHRtLCBz dHJ1Y3QgZmlsZSAqcGVyc2lzdGVudF9zd2FwX3N0b3JhZ2UpCj4gPiAgCQlzd2FwX3N0b3JhZ2Ug PSBzaG1lbV9maWxlX3NldHVwKCJ0dG0gc3dhcCIsCj4gPiAgCQkJCQkJdHRtLT5udW1fcGFnZXMg PDwgUEFHRV9TSElGVCwKPiA+ICAJCQkJCQkwKTsKPiA+IC0JCWlmICh1bmxpa2VseShJU19FUlIo c3dhcF9zdG9yYWdlKSkpIHsKPiA+ICsJCWlmIChJU19FUlIoc3dhcF9zdG9yYWdlKSkgewo+ID4g IAkJCXByX2VycigiRmFpbGVkIGFsbG9jYXRpbmcgc3dhcCBzdG9yYWdlXG4iKTsKPiA+ICAJCQly ZXR1cm4gUFRSX0VSUihzd2FwX3N0b3JhZ2UpOwo+ID4gIAkJfQo+ID4gQEAgLTM1NCw3ICszNTQs NyBAQCBpbnQgdHRtX3R0X3N3YXBvdXQoc3RydWN0IHR0bV90dCAqdHRtLCBzdHJ1Y3QgZmlsZSAq cGVyc2lzdGVudF9zd2FwX3N0b3JhZ2UpCj4gPiAgCQlpZiAodW5saWtlbHkoZnJvbV9wYWdlID09 IE5VTEwpKQo+ID4gIAkJCWNvbnRpbnVlOwo+ID4gIAkJdG9fcGFnZSA9IHNobWVtX3JlYWRfbWFw cGluZ19wYWdlKHN3YXBfc3BhY2UsIGkpOwo+ID4gLQkJaWYgKHVubGlrZWx5KElTX0VSUih0b19w YWdlKSkpIHsKPiA+ICsJCWlmIChJU19FUlIodG9fcGFnZSkpIHsKPiA+ICAJCQlyZXQgPSBQVFJf RVJSKHRvX3BhZ2UpOwo+ID4gIAkJCWdvdG8gb3V0X2VycjsKPiA+ICAJCX0KPiA+IGRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9jb250ZXh0LmMgYi9kcml2ZXJzL2dw dS9kcm0vdm13Z2Z4L3Ztd2dmeF9jb250ZXh0LmMKPiA+IGluZGV4IDVhYzkyODc0NDA0ZC4uNDRl NmVjYmEzZGU3IDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhf Y29udGV4dC5jCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9jb250ZXh0 LmMKPiA+IEBAIC0xNTksNyArMTU5LDcgQEAgc3RhdGljIGludCB2bXdfZ2JfY29udGV4dF9pbml0 KHN0cnVjdCB2bXdfcHJpdmF0ZSAqZGV2X3ByaXYsCj4gPiAgCj4gPiAgCWlmIChkZXZfcHJpdi0+ aGFzX21vYikgewo+ID4gIAkJdWN0eC0+bWFuID0gdm13X2NtZGJ1Zl9yZXNfbWFuX2NyZWF0ZShk ZXZfcHJpdik7Cj4gPiAtCQlpZiAodW5saWtlbHkoSVNfRVJSKHVjdHgtPm1hbikpKSB7Cj4gPiAr CQlpZiAoSVNfRVJSKHVjdHgtPm1hbikpIHsKPiA+ICAJCQlyZXQgPSBQVFJfRVJSKHVjdHgtPm1h bik7Cj4gPiAgCQkJdWN0eC0+bWFuID0gTlVMTDsKPiA+ICAJCQlnb3RvIG91dF9lcnI7Cj4gPiBk aWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZHJ2LmMgYi9kcml2ZXJz L2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9kcnYuYwo+ID4gaW5kZXggNjIwYmI1Y2Y2MTdjLi42MjE4 YTM2Y2YwMWEgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF9k cnYuYwo+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfZHJ2LmMKPiA+IEBA IC0xMDU0LDcgKzEwNTQsNyBAQCBzdGF0aWMgbG9uZyB2bXdfZ2VuZXJpY19pb2N0bChzdHJ1Y3Qg ZmlsZSAqZmlscCwgdW5zaWduZWQgaW50IGNtZCwKPiA+ICAJCXJldHVybiAtRUlOVkFMOwo+ID4g IAo+ID4gIAl2bWFzdGVyID0gdm13X21hc3Rlcl9jaGVjayhkZXYsIGZpbGVfcHJpdiwgZmxhZ3Mp Owo+ID4gLQlpZiAodW5saWtlbHkoSVNfRVJSKHZtYXN0ZXIpKSkgewo+ID4gKwlpZiAoSVNfRVJS KHZtYXN0ZXIpKSB7Cj4gPiAgCQlyZXQgPSBQVFJfRVJSKHZtYXN0ZXIpOwo+ID4gIAo+ID4gIAkJ aWYgKHJldCAhPSAtRVJFU1RBUlRTWVMpCj4gPiAtLSAKPiA+IDIuNC4wCj4gPiAKPiBfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWls aW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAoKLS0gCkRhbmllbCBW ZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZm d2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752518AbbHCIBi (ORCPT ); Mon, 3 Aug 2015 04:01:38 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:36437 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752009AbbHCIBe (ORCPT ); Mon, 3 Aug 2015 04:01:34 -0400 Date: Mon, 3 Aug 2015 10:01:26 +0200 From: Daniel Vetter To: Sinclair Yeh Cc: Viresh Kumar , Thomas Hellstrom , linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, "open list:DRM DRIVERS" , Ben Skeggs , akpm@linux-foundation.org Subject: Re: [PATCH 04/15] drivers: gpu: Drop unlikely before IS_ERR(_OR_NULL) Message-ID: <20150803080126.GA24689@phenom.ffwll.local> Mail-Followup-To: Sinclair Yeh , Viresh Kumar , Thomas Hellstrom , linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, "open list:DRM DRIVERS" , Ben Skeggs , akpm@linux-foundation.org References: <1b19585aab58d665973c475677ce5a80fc6aa48c.1438331416.git.viresh.kumar@linaro.org> <20150731155228.GA18431@syeh-linux> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150731155228.GA18431@syeh-linux> X-Operating-System: Linux phenom 4.2.0-rc1+ User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jul 31, 2015 at 08:53:04AM -0700, Sinclair Yeh wrote: > 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 Applied to drm-misc, thanks. -Daniel > > --- > > 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 > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch