From: Minghao Chi <chi.minghao@zte.com.cn>

Simplify the return expression.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>
---
 drivers/gpu/drm/i915/i915_driver.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 09de45d3e274..d11a7445909a 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -977,13 +977,8 @@ static void i915_driver_release(struct drm_device *dev)
 static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
 {
 	struct drm_i915_private *i915 = to_i915(dev);
-	int ret;
 
-	ret = i915_gem_open(i915, file);
-	if (ret)
-		return ret;
-
-	return 0;
+	return i915_gem_open(i915, file);
 }
 
 /**
-- 
2.25.1

On Thu, 05 May 2022, cgel.zte@gmail.com wrote:
> From: Minghao Chi <chi.minghao@zte.com.cn>
>
> Simplify the return expression.
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn>

No, I don't want this. Please stop sending these return expression
"simplifications". The cocci script to do this was removed in commit
b784c7707502 ("coccinnelle: Remove ptr_ret script") specifically to stop
these changes. Please read the commit message for that.

BR,
Jani.


> ---
>  drivers/gpu/drm/i915/i915_driver.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 09de45d3e274..d11a7445909a 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -977,13 +977,8 @@ static void i915_driver_release(struct drm_device *dev)
>  static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
>  {
>  	struct drm_i915_private *i915 = to_i915(dev);
> -	int ret;
>  
> -	ret = i915_gem_open(i915, file);
> -	if (ret)
> -		return ret;
> -
> -	return 0;
> +	return i915_gem_open(i915, file);
>  }
>  
>  /**

-- 
Jani Nikula, Intel Open Source Graphics Center