From: kbuild test robot Date: Fri, 27 Mar 2015 11:26:35 +0000 (+0800) Subject: drm/i915: fix simple_return.cocci warnings X-Git-Tag: v4.1-rc1~69^2~20^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2f2cf68261acc4c5356dd07e8a8966612ae5a0d4;p=karo-tx-linux.git drm/i915: fix simple_return.cocci warnings drivers/gpu/drm/i915/i915_gem_gtt.c:1349:1-4: WARNING: end returns can be simpified and declaration on line 1347 can be dropped Simplify a trivial if-return sequence. Possibly combine with a preceding function call. Generated by: scripts/coccinelle/misc/simple_return.cocci CC: Michel Thierry Signed-off-by: Fengguang Wu Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index e33b1214c4d8..e82cec2c714e 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -1349,13 +1349,7 @@ err_out: static int gen6_ppgtt_alloc(struct i915_hw_ppgtt *ppgtt) { - int ret; - - ret = gen6_ppgtt_allocate_page_directories(ppgtt); - if (ret) - return ret; - - return 0; + return gen6_ppgtt_allocate_page_directories(ppgtt); } static void gen6_scratch_va_range(struct i915_hw_ppgtt *ppgtt,