diff mbox

drm/i915: fix simple_return.cocci warnings

Message ID 20150305140308.GA14261@waimea.lkp.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Fengguang Wu March 5, 2015, 2:03 p.m. UTC
drivers/gpu/drm/i915/intel_ringbuffer.c:435:1-4: WARNING: end returns can be simpified

 Simplify a trivial if-return sequence.  Possibly combine with a
 preceding function call.
Generated by: scripts/coccinelle/misc/simple_return.cocci

CC: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---

 intel_ringbuffer.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Daniel Vetter March 5, 2015, 3:30 p.m. UTC | #1
On Thu, Mar 05, 2015 at 10:03:08PM +0800, kbuild test robot wrote:
> drivers/gpu/drm/i915/intel_ringbuffer.c:435:1-4: WARNING: end returns can be simpified
> 
>  Simplify a trivial if-return sequence.  Possibly combine with a
>  preceding function call.
> Generated by: scripts/coccinelle/misc/simple_return.cocci
> 
> CC: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>

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

> ---
> 
>  intel_ringbuffer.c |    6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -432,11 +432,7 @@ gen8_render_ring_flush(struct intel_engi
>  			return ret;
>  	}
>  
> -	ret = gen8_emit_pipe_control(ring, flags, scratch_addr);
> -	if (ret)
> -		return ret;
> -
> -	return 0;
> +	return gen8_emit_pipe_control(ring, flags, scratch_addr);
>  }
>  
>  static void ring_write_tail(struct intel_engine_cs *ring,
diff mbox

Patch

--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -432,11 +432,7 @@  gen8_render_ring_flush(struct intel_engi
 			return ret;
 	}
 
-	ret = gen8_emit_pipe_control(ring, flags, scratch_addr);
-	if (ret)
-		return ret;
-
-	return 0;
+	return gen8_emit_pipe_control(ring, flags, scratch_addr);
 }
 
 static void ring_write_tail(struct intel_engine_cs *ring,