From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Date: Wed, 09 Oct 2019 09:52:15 +0000 Subject: Re: [PATCH][next] drm/i915: remove redundant variable err Message-Id: <87h84igsa8.fsf@intel.com> List-Id: References: <20191009093935.17895-1-colin.king@canonical.com> In-Reply-To: <20191009093935.17895-1-colin.king@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Colin King , Joonas Lahtinen , Rodrigo Vivi , David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org On Wed, 09 Oct 2019, Colin King wrote: > From: Colin Ian King > > An earlier commit removed any error assignments to err and we > are now left with a zero assignment to err and a check that is > always false. Clean this up by removing the redundant variable > err and the error check. > > Addresses-Coverity: ("'Constant' variable guard") > Signed-off-by: Colin Ian King Fixes: b1e3177bd1d8 ("drm/i915: Coordinate i915_active with its own mutex") Reviewed-by: Jani Nikula BR, Jani. > --- > drivers/gpu/drm/i915/i915_active.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c > index aa37c07004b9..67305165c12a 100644 > --- a/drivers/gpu/drm/i915/i915_active.c > +++ b/drivers/gpu/drm/i915/i915_active.c > @@ -438,7 +438,6 @@ static void enable_signaling(struct i915_active_fence *active) > int i915_active_wait(struct i915_active *ref) > { > struct active_node *it, *n; > - int err = 0; > > might_sleep(); > > @@ -456,8 +455,6 @@ int i915_active_wait(struct i915_active *ref) > /* Any fence added after the wait begins will not be auto-signaled */ > > i915_active_release(ref); > - if (err) > - return err; > > if (wait_var_event_interruptible(ref, i915_active_is_idle(ref))) > return -EINTR; -- Jani Nikula, Intel Open Source Graphics Center From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH][next] drm/i915: remove redundant variable err Date: Wed, 09 Oct 2019 12:52:15 +0300 Message-ID: <87h84igsa8.fsf@intel.com> References: <20191009093935.17895-1-colin.king@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191009093935.17895-1-colin.king@canonical.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Colin King , Joonas Lahtinen , Rodrigo Vivi , David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCAwOSBPY3QgMjAxOSwgQ29saW4gS2luZyA8Y29saW4ua2luZ0BjYW5vbmljYWwuY29t PiB3cm90ZToKPiBGcm9tOiBDb2xpbiBJYW4gS2luZyA8Y29saW4ua2luZ0BjYW5vbmljYWwuY29t Pgo+Cj4gQW4gZWFybGllciBjb21taXQgcmVtb3ZlZCBhbnkgZXJyb3IgYXNzaWdubWVudHMgdG8g ZXJyIGFuZCB3ZQo+IGFyZSBub3cgbGVmdCB3aXRoIGEgemVybyBhc3NpZ25tZW50IHRvIGVyciBh bmQgYSBjaGVjayB0aGF0IGlzCj4gYWx3YXlzIGZhbHNlLiBDbGVhbiB0aGlzIHVwIGJ5IHJlbW92 aW5nIHRoZSByZWR1bmRhbnQgdmFyaWFibGUKPiBlcnIgYW5kIHRoZSBlcnJvciBjaGVjay4KPgo+ IEFkZHJlc3Nlcy1Db3Zlcml0eTogKCInQ29uc3RhbnQnIHZhcmlhYmxlIGd1YXJkIikKPiBTaWdu ZWQtb2ZmLWJ5OiBDb2xpbiBJYW4gS2luZyA8Y29saW4ua2luZ0BjYW5vbmljYWwuY29tPgoKRml4 ZXM6IGIxZTMxNzdiZDFkOCAoImRybS9pOTE1OiBDb29yZGluYXRlIGk5MTVfYWN0aXZlIHdpdGgg aXRzIG93biBtdXRleCIpClJldmlld2VkLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50 ZWwuY29tPgoKCkJSLApKYW5pLgoKCj4gLS0tCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf YWN0aXZlLmMgfCAzIC0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMyBkZWxldGlvbnMoLSkKPgo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2FjdGl2ZS5jIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaTkxNV9hY3RpdmUuYwo+IGluZGV4IGFhMzdjMDcwMDRiOS4uNjczMDUxNjVj MTJhIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfYWN0aXZlLmMKPiAr KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2FjdGl2ZS5jCj4gQEAgLTQzOCw3ICs0Mzgs NiBAQCBzdGF0aWMgdm9pZCBlbmFibGVfc2lnbmFsaW5nKHN0cnVjdCBpOTE1X2FjdGl2ZV9mZW5j ZSAqYWN0aXZlKQo+ICBpbnQgaTkxNV9hY3RpdmVfd2FpdChzdHJ1Y3QgaTkxNV9hY3RpdmUgKnJl ZikKPiAgewo+ICAJc3RydWN0IGFjdGl2ZV9ub2RlICppdCwgKm47Cj4gLQlpbnQgZXJyID0gMDsK PiAgCj4gIAltaWdodF9zbGVlcCgpOwo+ICAKPiBAQCAtNDU2LDggKzQ1NSw2IEBAIGludCBpOTE1 X2FjdGl2ZV93YWl0KHN0cnVjdCBpOTE1X2FjdGl2ZSAqcmVmKQo+ICAJLyogQW55IGZlbmNlIGFk ZGVkIGFmdGVyIHRoZSB3YWl0IGJlZ2lucyB3aWxsIG5vdCBiZSBhdXRvLXNpZ25hbGVkICovCj4g IAo+ICAJaTkxNV9hY3RpdmVfcmVsZWFzZShyZWYpOwo+IC0JaWYgKGVycikKPiAtCQlyZXR1cm4g ZXJyOwo+ICAKPiAgCWlmICh3YWl0X3Zhcl9ldmVudF9pbnRlcnJ1cHRpYmxlKHJlZiwgaTkxNV9h Y3RpdmVfaXNfaWRsZShyZWYpKSkKPiAgCQlyZXR1cm4gLUVJTlRSOwoKLS0gCkphbmkgTmlrdWxh LCBJbnRlbCBPcGVuIFNvdXJjZSBHcmFwaGljcyBDZW50ZXIKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1n ZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE8BDC47404 for ; Wed, 9 Oct 2019 09:52:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0A8421721 for ; Wed, 9 Oct 2019 09:52:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730787AbfJIJw0 (ORCPT ); Wed, 9 Oct 2019 05:52:26 -0400 Received: from mga03.intel.com ([134.134.136.65]:7292 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725935AbfJIJwX (ORCPT ); Wed, 9 Oct 2019 05:52:23 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Oct 2019 02:52:22 -0700 X-IronPort-AV: E=Sophos;i="5.67,273,1566889200"; d="scan'208";a="187581234" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Oct 2019 02:52:18 -0700 From: Jani Nikula To: Colin King , Joonas Lahtinen , Rodrigo Vivi , David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH][next] drm/i915: remove redundant variable err In-Reply-To: <20191009093935.17895-1-colin.king@canonical.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20191009093935.17895-1-colin.king@canonical.com> Date: Wed, 09 Oct 2019 12:52:15 +0300 Message-ID: <87h84igsa8.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 09 Oct 2019, Colin King wrote: > From: Colin Ian King > > An earlier commit removed any error assignments to err and we > are now left with a zero assignment to err and a check that is > always false. Clean this up by removing the redundant variable > err and the error check. > > Addresses-Coverity: ("'Constant' variable guard") > Signed-off-by: Colin Ian King Fixes: b1e3177bd1d8 ("drm/i915: Coordinate i915_active with its own mutex") Reviewed-by: Jani Nikula BR, Jani. > --- > drivers/gpu/drm/i915/i915_active.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c > index aa37c07004b9..67305165c12a 100644 > --- a/drivers/gpu/drm/i915/i915_active.c > +++ b/drivers/gpu/drm/i915/i915_active.c > @@ -438,7 +438,6 @@ static void enable_signaling(struct i915_active_fence *active) > int i915_active_wait(struct i915_active *ref) > { > struct active_node *it, *n; > - int err = 0; > > might_sleep(); > > @@ -456,8 +455,6 @@ int i915_active_wait(struct i915_active *ref) > /* Any fence added after the wait begins will not be auto-signaled */ > > i915_active_release(ref); > - if (err) > - return err; > > if (wait_var_event_interruptible(ref, i915_active_is_idle(ref))) > return -EINTR; -- Jani Nikula, Intel Open Source Graphics Center