[PATCH][next] drm/i915: remove redundant repeated checks on err

[Cavitt, Jonathan]

-----Original Message-----
From: Intel-gfx <intel-gfx-bounces at lists.freedesktop.org> On Behalf Of Colin Ian King
Sent: Friday, August 1, 2025 8:17 AM
To: Jani Nikula <jani.nikula at linux.intel.com>; Vivi, Rodrigo <rodrigo.vivi at intel.com>; Tvrtko Ursulin <tursulin at ursulin.net>; David Airlie <airlied at gmail.com>; Simona Vetter <simona at ffwll.ch>; intel-gfx at lists.freedesktop.org; dri-devel at lists.freedesktop.org
Cc: kernel-janitors at vger.kernel.org; linux-kernel at vger.kernel.org
Subject: [PATCH][next] drm/i915: remove redundant repeated checks on err
> 
> There are a couple of redundant repeated checks on err being non-zero that
> are always true because they are inside a previous check on err being
> non-zero. Remove the duplicated checks.
> 
> Signed-off-by: Colin Ian King <colin.i.king at gmail.com>

Reviewed-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
-Jonathan Cavitt

> ---
>  drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
> index d8f4a10d71de..3913b48cece7 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
> @@ -142,8 +142,7 @@ static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww,
>  		if (err) {
>  			if (!silent_migrate)
>  				pr_err("Object failed migration to smem\n");
> -			if (err)
> -				return err;
> +			return err;
>  		}
>  
>  		if (i915_gem_object_is_lmem(obj)) {
> @@ -161,8 +160,7 @@ static int lmem_pages_migrate_one(struct i915_gem_ww_ctx *ww,
>  		if (err) {
>  			if (!silent_migrate)
>  				pr_err("Object failed migration to lmem\n");
> -			if (err)
> -				return err;
> +			return err;
>  		}
>  
>  		if (i915_gem_object_has_struct_page(obj)) {
> -- 
> 2.50.0
> 
>