drm/i915: fix simple_return.cocci warnings
authorkbuild test robot <fengguang.wu@intel.com>
Fri, 27 Mar 2015 11:26:35 +0000 (19:26 +0800)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 27 Mar 2015 13:49:03 +0000 (14:49 +0100)
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 <michel.thierry@intel.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem_gtt.c

index e33b1214c4d8fd85694db9b8778ecc42ec43c0a3..e82cec2c714e68d47fd77248011d286e9ec2a4a2 100644 (file)
@@ -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,