| Message ID | 1473990023-17097-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | New |
| Headers | show |
Hi Chris, 2016-09-16 15:15 GMT+09:00 Chris Wilson <chris@chris-wilson.co.uk>: > On Fri, Sep 16, 2016 at 10:40:23AM +0900, Masahiro Yamada wrote: >> 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); > > These are written like this for consistency and ease of change. > -Chris > OK, then please feel free to reject this patch. -- Best Regards Masahiro Yamada
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)
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(-) -- 1.9.1