All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: dri-devel@lists.freedesktop.org, Sean Paul <seanpaul@google.com>
Cc: David Airlie <airlied@linux.ie>,
	Christian K?nig <christian.koenig@amd.com>,
	Jani Nikula <jani.nikula@linux.intel.com>,
	Alexander Deucher <Alexander.Deucher@amd.com>,
	Daniel Vetter <daniel.vetter@intel.com>,
	intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	Masahiro Yamada <yamada.masahiro@socionext.com>
Subject: [PATCH v3 5/5] drm/i915: squash lines for simple wrapper functions
Date: Fri, 16 Sep 2016 10:40:23 +0900	[thread overview]
Message-ID: <1473990023-17097-1-git-send-email-yamada.masahiro@socionext.com> (raw)

Remove unneeded variables and assignments.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v3:
  - Keep the wrapper function.
    Cleanup of variables and assignments only.
  - Fix intel_engine_init_common() as well.

 drivers/gpu/drm/i915/i915_drv.c        | 8 +-------
 drivers/gpu/drm/i915/intel_engine_cs.c | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7f4e8ad..1503c88 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1324,13 +1324,7 @@ void i915_driver_unload(struct drm_device *dev)
 
 static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
 {
-	int ret;
-
-	ret = i915_gem_open(dev, file);
-	if (ret)
-		return ret;
-
-	return 0;
+	return i915_gem_open(dev, file);
 }
 
 /**
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index e405f10..ebb4bf8 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -298,13 +298,7 @@ static void intel_engine_cleanup_scratch(struct intel_engine_cs *engine)
  */
 int intel_engine_init_common(struct intel_engine_cs *engine)
 {
-	int ret;
-
-	ret = intel_engine_init_breadcrumbs(engine);
-	if (ret)
-		return ret;
-
-	return 0;
+	return intel_engine_init_breadcrumbs(engine);
 }
 
 void intel_engine_reset_irq(struct intel_engine_cs *engine)
-- 
1.9.1

WARNING: multiple messages have this Message-ID (diff)
From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: dri-devel@lists.freedesktop.org, Sean Paul <seanpaul@google.com>
Cc: David Airlie <airlied@linux.ie>,
	intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	Masahiro Yamada <yamada.masahiro@socionext.com>,
	Alexander Deucher <Alexander.Deucher@amd.com>,
	Daniel Vetter <daniel.vetter@intel.com>,
	Christian K?nig <christian.koenig@amd.com>
Subject: [PATCH v3 5/5] drm/i915: squash lines for simple wrapper functions
Date: Fri, 16 Sep 2016 10:40:23 +0900	[thread overview]
Message-ID: <1473990023-17097-1-git-send-email-yamada.masahiro@socionext.com> (raw)

Remove unneeded variables and assignments.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v3:
  - Keep the wrapper function.
    Cleanup of variables and assignments only.
  - Fix intel_engine_init_common() as well.

 drivers/gpu/drm/i915/i915_drv.c        | 8 +-------
 drivers/gpu/drm/i915/intel_engine_cs.c | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7f4e8ad..1503c88 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1324,13 +1324,7 @@ void i915_driver_unload(struct drm_device *dev)
 
 static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
 {
-	int ret;
-
-	ret = i915_gem_open(dev, file);
-	if (ret)
-		return ret;
-
-	return 0;
+	return i915_gem_open(dev, file);
 }
 
 /**
diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index e405f10..ebb4bf8 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -298,13 +298,7 @@ static void intel_engine_cleanup_scratch(struct intel_engine_cs *engine)
  */
 int intel_engine_init_common(struct intel_engine_cs *engine)
 {
-	int ret;
-
-	ret = intel_engine_init_breadcrumbs(engine);
-	if (ret)
-		return ret;
-
-	return 0;
+	return intel_engine_init_breadcrumbs(engine);
 }
 
 void intel_engine_reset_irq(struct intel_engine_cs *engine)
-- 
1.9.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

             reply	other threads:[~2016-09-16  1:39 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-16  1:40 Masahiro Yamada [this message]
2016-09-16  1:40 ` [PATCH v3 5/5] drm/i915: squash lines for simple wrapper functions Masahiro Yamada
2016-09-16  6:15 ` [Intel-gfx] " Chris Wilson
2016-09-16  6:15   ` Chris Wilson
2016-09-16  6:36   ` Masahiro Yamada

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=1473990023-17097-1-git-send-email-yamada.masahiro@socionext.com \
    --to=yamada.masahiro@socionext.com \
    --cc=Alexander.Deucher@amd.com \
    --cc=airlied@linux.ie \
    --cc=christian.koenig@amd.com \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=seanpaul@google.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.