From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Date: Fri, 05 May 2017 05:54:07 +0000 Subject: Re: [PATCH 4/9] drm/i915: Delete unnecessary braces in three functions Message-Id: <8737cjyhkw.fsf@intel.com> List-Id: References: <39c8a155-cf89-1aa5-9ca6-4e9ccf3aa602@users.sourceforge.net> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: SF Markus Elfring , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Chris Wilson , Daniel Vetter , David Airlie Cc: kernel-janitors@vger.kernel.org, LKML On Thu, 04 May 2017, SF Markus Elfring wrote: > From: Markus Elfring > Date: Thu, 4 May 2017 13:40:53 +0200 > > Do not use curly brackets at some source code places > where a single statement should be sufficient. We only tend to do this kind of changes when we're changing the surrounding code anyway. I'm sure there are plenty of places where you could add or remove braces, but it's not productive to go around changing just them. BR, Jani. > > Signed-off-by: Markus Elfring > --- > drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 296108464f2b..bf9a2e8d8c16 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -565,13 +565,13 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) > u32 addr; > > pending = atomic_read(&work->pending); > - if (pending) { > + if (pending) > seq_printf(m, "Flip ioctl preparing on pipe %c (plane %c)\n", > pipe, plane); > - } else { > + else > seq_printf(m, "Flip pending (waiting for vsync) on pipe %c (plane %c)\n", > pipe, plane); > - } > + > if (work->flip_queued_req) { > struct intel_engine_cs *engine = work->flip_queued_req->engine; > > @@ -3130,13 +3130,11 @@ static void intel_plane_info(struct seq_file *m, struct intel_crtc *intel_crtc) > } > > state = plane->state; > - > - if (state->fb) { > + if (state->fb) > drm_get_format_name(state->fb->format->format, > &format_name); > - } else { > + else > sprintf(format_name.str, "N/A"); > - } > > seq_printf(m, "\t--Plane id %d: type=%s, crtc_pos=%4dx%4d, crtc_size=%4dx%4d, src_pos=%d.%04ux%d.%04u, src_size=%d.%04ux%d.%04u, format=%s, rotation=%s\n", > plane->base.id, > @@ -4636,13 +4634,12 @@ static int i915_sseu_status(struct seq_file *m, void *unused) > > intel_runtime_pm_get(dev_priv); > > - if (IS_CHERRYVIEW(dev_priv)) { > + if (IS_CHERRYVIEW(dev_priv)) > cherryview_sseu_device_status(dev_priv, &sseu); > - } else if (IS_BROADWELL(dev_priv)) { > + else if (IS_BROADWELL(dev_priv)) > broadwell_sseu_device_status(dev_priv, &sseu); > - } else if (INTEL_GEN(dev_priv) >= 9) { > + else if (INTEL_GEN(dev_priv) >= 9) > gen9_sseu_device_status(dev_priv, &sseu); > - } > > intel_runtime_pm_put(dev_priv); -- Jani Nikula, Intel Open Source Technology Center From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 4/9] drm/i915: Delete unnecessary braces in three functions Date: Fri, 05 May 2017 08:54:07 +0300 Message-ID: <8737cjyhkw.fsf@intel.com> References: <39c8a155-cf89-1aa5-9ca6-4e9ccf3aa602@users.sourceforge.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: SF Markus Elfring , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Chris Wilson , Daniel Vetter , David Airlie Cc: kernel-janitors@vger.kernel.org, LKML List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCAwNCBNYXkgMjAxNywgU0YgTWFya3VzIEVsZnJpbmcgPGVsZnJpbmdAdXNlcnMuc291 cmNlZm9yZ2UubmV0PiB3cm90ZToKPiBGcm9tOiBNYXJrdXMgRWxmcmluZyA8ZWxmcmluZ0B1c2Vy cy5zb3VyY2Vmb3JnZS5uZXQ+Cj4gRGF0ZTogVGh1LCA0IE1heSAyMDE3IDEzOjQwOjUzICswMjAw Cj4KPiBEbyBub3QgdXNlIGN1cmx5IGJyYWNrZXRzIGF0IHNvbWUgc291cmNlIGNvZGUgcGxhY2Vz Cj4gd2hlcmUgYSBzaW5nbGUgc3RhdGVtZW50IHNob3VsZCBiZSBzdWZmaWNpZW50LgoKV2Ugb25s eSB0ZW5kIHRvIGRvIHRoaXMga2luZCBvZiBjaGFuZ2VzIHdoZW4gd2UncmUgY2hhbmdpbmcgdGhl CnN1cnJvdW5kaW5nIGNvZGUgYW55d2F5LiBJJ20gc3VyZSB0aGVyZSBhcmUgcGxlbnR5IG9mIHBs YWNlcyB3aGVyZSB5b3UKY291bGQgYWRkIG9yIHJlbW92ZSBicmFjZXMsIGJ1dCBpdCdzIG5vdCBw cm9kdWN0aXZlIHRvIGdvIGFyb3VuZApjaGFuZ2luZyBqdXN0IHRoZW0uCgpCUiwKSmFuaS4KCgo+ Cj4gU2lnbmVkLW9mZi1ieTogTWFya3VzIEVsZnJpbmcgPGVsZnJpbmdAdXNlcnMuc291cmNlZm9y Z2UubmV0Pgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYyB8IDE5 ICsrKysrKysrLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwg MTEgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkx NV9kZWJ1Z2ZzLmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2RlYnVnZnMuYwo+IGluZGV4 IDI5NjEwODQ2NGYyYi4uYmY5YTJlOGQ4YzE2IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9pOTE1L2k5MTVfZGVidWdmcy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9k ZWJ1Z2ZzLmMKPiBAQCAtNTY1LDEzICs1NjUsMTMgQEAgc3RhdGljIGludCBpOTE1X2dlbV9wYWdl ZmxpcF9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqZGF0YSkKPiAgCQkJdTMyIGFkZHI7 Cj4gIAo+ICAJCQlwZW5kaW5nID0gYXRvbWljX3JlYWQoJndvcmstPnBlbmRpbmcpOwo+IC0JCQlp ZiAocGVuZGluZykgewo+ICsJCQlpZiAocGVuZGluZykKPiAgCQkJCXNlcV9wcmludGYobSwgIkZs aXAgaW9jdGwgcHJlcGFyaW5nIG9uIHBpcGUgJWMgKHBsYW5lICVjKVxuIiwKPiAgCQkJCQkgICBw aXBlLCBwbGFuZSk7Cj4gLQkJCX0gZWxzZSB7Cj4gKwkJCWVsc2UKPiAgCQkJCXNlcV9wcmludGYo bSwgIkZsaXAgcGVuZGluZyAod2FpdGluZyBmb3IgdnN5bmMpIG9uIHBpcGUgJWMgKHBsYW5lICVj KVxuIiwKPiAgCQkJCQkgICBwaXBlLCBwbGFuZSk7Cj4gLQkJCX0KPiArCj4gIAkJCWlmICh3b3Jr LT5mbGlwX3F1ZXVlZF9yZXEpIHsKPiAgCQkJCXN0cnVjdCBpbnRlbF9lbmdpbmVfY3MgKmVuZ2lu ZSA9IHdvcmstPmZsaXBfcXVldWVkX3JlcS0+ZW5naW5lOwo+ICAKPiBAQCAtMzEzMCwxMyArMzEz MCwxMSBAQCBzdGF0aWMgdm9pZCBpbnRlbF9wbGFuZV9pbmZvKHN0cnVjdCBzZXFfZmlsZSAqbSwg c3RydWN0IGludGVsX2NydGMgKmludGVsX2NydGMpCj4gIAkJfQo+ICAKPiAgCQlzdGF0ZSA9IHBs YW5lLT5zdGF0ZTsKPiAtCj4gLQkJaWYgKHN0YXRlLT5mYikgewo+ICsJCWlmIChzdGF0ZS0+ZmIp Cj4gIAkJCWRybV9nZXRfZm9ybWF0X25hbWUoc3RhdGUtPmZiLT5mb3JtYXQtPmZvcm1hdCwKPiAg CQkJCQkgICAgJmZvcm1hdF9uYW1lKTsKPiAtCQl9IGVsc2Ugewo+ICsJCWVsc2UKPiAgCQkJc3By aW50Zihmb3JtYXRfbmFtZS5zdHIsICJOL0EiKTsKPiAtCQl9Cj4gIAo+ICAJCXNlcV9wcmludGYo bSwgIlx0LS1QbGFuZSBpZCAlZDogdHlwZT0lcywgY3J0Y19wb3M9JTRkeCU0ZCwgY3J0Y19zaXpl PSU0ZHglNGQsIHNyY19wb3M9JWQuJTA0dXglZC4lMDR1LCBzcmNfc2l6ZT0lZC4lMDR1eCVkLiUw NHUsIGZvcm1hdD0lcywgcm90YXRpb249JXNcbiIsCj4gIAkJCSAgIHBsYW5lLT5iYXNlLmlkLAo+ IEBAIC00NjM2LDEzICs0NjM0LDEyIEBAIHN0YXRpYyBpbnQgaTkxNV9zc2V1X3N0YXR1cyhzdHJ1 Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKPiAgCj4gIAlpbnRlbF9ydW50aW1lX3BtX2dl dChkZXZfcHJpdik7Cj4gIAo+IC0JaWYgKElTX0NIRVJSWVZJRVcoZGV2X3ByaXYpKSB7Cj4gKwlp ZiAoSVNfQ0hFUlJZVklFVyhkZXZfcHJpdikpCj4gIAkJY2hlcnJ5dmlld19zc2V1X2RldmljZV9z dGF0dXMoZGV2X3ByaXYsICZzc2V1KTsKPiAtCX0gZWxzZSBpZiAoSVNfQlJPQURXRUxMKGRldl9w cml2KSkgewo+ICsJZWxzZSBpZiAoSVNfQlJPQURXRUxMKGRldl9wcml2KSkKPiAgCQlicm9hZHdl bGxfc3NldV9kZXZpY2Vfc3RhdHVzKGRldl9wcml2LCAmc3NldSk7Cj4gLQl9IGVsc2UgaWYgKElO VEVMX0dFTihkZXZfcHJpdikgPj0gOSkgewo+ICsJZWxzZSBpZiAoSU5URUxfR0VOKGRldl9wcml2 KSA+PSA5KQo+ICAJCWdlbjlfc3NldV9kZXZpY2Vfc3RhdHVzKGRldl9wcml2LCAmc3NldSk7Cj4g LQl9Cj4gIAo+ICAJaW50ZWxfcnVudGltZV9wbV9wdXQoZGV2X3ByaXYpOwoKLS0gCkphbmkgTmlr dWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755463AbdEEFyU (ORCPT ); Fri, 5 May 2017 01:54:20 -0400 Received: from mga06.intel.com ([134.134.136.31]:48980 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751079AbdEEFyS (ORCPT ); Fri, 5 May 2017 01:54:18 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,291,1491289200"; d="scan'208";a="853141687" From: Jani Nikula To: SF Markus Elfring , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Chris Wilson , Daniel Vetter , David Airlie Cc: LKML , kernel-janitors@vger.kernel.org Subject: Re: [PATCH 4/9] drm/i915: Delete unnecessary braces in three functions In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <39c8a155-cf89-1aa5-9ca6-4e9ccf3aa602@users.sourceforge.net> Date: Fri, 05 May 2017 08:54:07 +0300 Message-ID: <8737cjyhkw.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 04 May 2017, SF Markus Elfring wrote: > From: Markus Elfring > Date: Thu, 4 May 2017 13:40:53 +0200 > > Do not use curly brackets at some source code places > where a single statement should be sufficient. We only tend to do this kind of changes when we're changing the surrounding code anyway. I'm sure there are plenty of places where you could add or remove braces, but it's not productive to go around changing just them. BR, Jani. > > Signed-off-by: Markus Elfring > --- > drivers/gpu/drm/i915/i915_debugfs.c | 19 ++++++++----------- > 1 file changed, 8 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index 296108464f2b..bf9a2e8d8c16 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -565,13 +565,13 @@ static int i915_gem_pageflip_info(struct seq_file *m, void *data) > u32 addr; > > pending = atomic_read(&work->pending); > - if (pending) { > + if (pending) > seq_printf(m, "Flip ioctl preparing on pipe %c (plane %c)\n", > pipe, plane); > - } else { > + else > seq_printf(m, "Flip pending (waiting for vsync) on pipe %c (plane %c)\n", > pipe, plane); > - } > + > if (work->flip_queued_req) { > struct intel_engine_cs *engine = work->flip_queued_req->engine; > > @@ -3130,13 +3130,11 @@ static void intel_plane_info(struct seq_file *m, struct intel_crtc *intel_crtc) > } > > state = plane->state; > - > - if (state->fb) { > + if (state->fb) > drm_get_format_name(state->fb->format->format, > &format_name); > - } else { > + else > sprintf(format_name.str, "N/A"); > - } > > seq_printf(m, "\t--Plane id %d: type=%s, crtc_pos=%4dx%4d, crtc_size=%4dx%4d, src_pos=%d.%04ux%d.%04u, src_size=%d.%04ux%d.%04u, format=%s, rotation=%s\n", > plane->base.id, > @@ -4636,13 +4634,12 @@ static int i915_sseu_status(struct seq_file *m, void *unused) > > intel_runtime_pm_get(dev_priv); > > - if (IS_CHERRYVIEW(dev_priv)) { > + if (IS_CHERRYVIEW(dev_priv)) > cherryview_sseu_device_status(dev_priv, &sseu); > - } else if (IS_BROADWELL(dev_priv)) { > + else if (IS_BROADWELL(dev_priv)) > broadwell_sseu_device_status(dev_priv, &sseu); > - } else if (INTEL_GEN(dev_priv) >= 9) { > + else if (INTEL_GEN(dev_priv) >= 9) > gen9_sseu_device_status(dev_priv, &sseu); > - } > > intel_runtime_pm_put(dev_priv); -- Jani Nikula, Intel Open Source Technology Center