public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
	Chris Wilson <chris@chris-wilson.co.uk>,
	Daniel Vetter <daniel.vetter@intel.com>,
	David Airlie <airlied@linux.ie>,
	Jani Nikula <jani.nikula@linux.intel.com>
Cc: kernel-janitors@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/9] drm/i915: Delete unnecessary braces in three functions
Date: Thu, 04 May 2017 16:55:36 +0000	[thread overview]
Message-ID: <c730d90c-0d71-50ed-d15d-a4d5c22712d0@users.sourceforge.net> (raw)
In-Reply-To: <39c8a155-cf89-1aa5-9ca6-4e9ccf3aa602@users.sourceforge.net>

From: Markus Elfring <elfring@users.sourceforge.net>
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.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 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);
 
-- 
2.12.2


  parent reply	other threads:[~2017-05-04 16:55 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <39c8a155-cf89-1aa5-9ca6-4e9ccf3aa602@users.sourceforge.net>
2017-05-04 16:51 ` [PATCH 1/9] drm/i915: Replace ten seq_puts() calls by seq_putc() SF Markus Elfring
2017-05-04 16:52 ` [PATCH 2/9] drm/i915: Combine five seq_printf() calls in i915_display_info() SF Markus Elfring
2017-05-04 16:54 ` [PATCH 3/9] drm/i915: Replace 14 seq_printf() calls by seq_puts() SF Markus Elfring
2017-05-04 20:09   ` Chris Wilson
2017-05-05  5:51     ` Jani Nikula
2017-05-04 16:55 ` SF Markus Elfring [this message]
2017-05-05  5:54   ` [PATCH 4/9] drm/i915: Delete unnecessary braces in three functions Jani Nikula
2017-05-04 16:56 ` [PATCH 5/9] drm/i915: Adjust seven checks for null pointers SF Markus Elfring
2017-05-05  5:46   ` Jani Nikula
2017-05-04 16:58 ` [PATCH 6/9] drm/i915: Add spaces for better code readability SF Markus Elfring
2017-05-05  5:49   ` Jani Nikula
2017-05-04 16:59 ` [PATCH 7/9] drm/i915: Combine substrings for a message in gen6_drpc_info() SF Markus Elfring
2017-05-04 20:12   ` Chris Wilson
2017-05-04 20:48     ` SF Markus Elfring
2017-05-04 20:58       ` Chris Wilson
2017-05-05  4:49     ` Dan Carpenter
2017-05-04 17:00 ` [PATCH 8/9] drm/i915: Replace a seq_puts() call by seq_putc() in two functions SF Markus Elfring
2017-05-04 17:01 ` [PATCH 9/9] drm/i915: Combine substrings for two messages in i915_ggtt_probe_hw() SF Markus Elfring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c730d90c-0d71-50ed-d15d-a4d5c22712d0@users.sourceforge.net \
    --to=elfring@users.sourceforge.net \
    --cc=airlied@linux.ie \
    --cc=chris@chris-wilson.co.uk \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox