Re: [PATCH] drm/i915: fix simple_return.cocci warnings

[Daniel Vetter <daniel@ffwll.ch>]

On Fri, Mar 27, 2015 at 07:26:35PM +0800, kbuild test robot wrote:
> 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>

Queued for -next, thanks for the patch.
-Daniel

> ---
> 
>  i915_gem_gtt.c |    8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -1344,13 +1344,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,

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch