Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1483409

[PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open()

Show all headers | View raw

i915_driver_open() is equivalent to i915_gem_open().  Replace the
i915_driver_open with the direct use of i915_gem_open().

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

 drivers/gpu/drm/i915/i915_drv.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 7f4e8ad..d3a33c4 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1322,17 +1322,6 @@ void i915_driver_unload(struct drm_device *dev)
 	i915_driver_cleanup_early(dev_priv);
 }
 
-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;
-}
-
 /**
  * i915_driver_lastclose - clean up after all DRM clients have exited
  * @dev: DRM device
@@ -2569,7 +2558,7 @@ static int intel_runtime_resume(struct device *kdev)
 	.driver_features =
 	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME |
 	    DRIVER_RENDER | DRIVER_MODESET,
-	.open = i915_driver_open,
+	.open = i915_gem_open,
 	.lastclose = i915_driver_lastclose,
 	.preclose = i915_driver_preclose,
 	.postclose = i915_driver_postclose,
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-09-14 16:50 +0200
  Re: [PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open() Jani Nikula <jani.nikula@linux.intel.com> - 2016-09-15 11:50 +0200
    Re: [PATCH v2 5/5] drm/i915: use i915_gem_open() directly instead of i915_driver_open() Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-09-15 11:50 +0200

csiph-web