On Fri, Aug 01, 2025 at 06:26:47PM +0000, Cavitt, Jonathan wrote:
> -----Original Message-----
> From: Intel-gfx <intel-gfx-boun...@lists.freedesktop.org> On Behalf Of Colin
> Ian King
> Sent: Friday, August 1, 2025 8:17 AM
> To: Jani Nikula <jani.nik...@linux.intel.com>; Vivi, Rodrigo
> <rodrigo.v...@intel.com>; Tvrtko Ursulin <tursu...@ursulin.net>; David Airlie
> <airl...@gmail.com>; Simona Vetter <sim...@ffwll.ch>;
> intel-...@lists.freedesktop.org; dri-devel@lists.freedesktop.org
> Cc: kernel-janit...@vger.kernel.org; linux-ker...@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.k...@gmail.com>
>
> Reviewed-by: Jonathan Cavitt <jonathan.cav...@intel.com>
pushed to drm-intel-gt-next
> -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
> >
> >
