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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250801151705.2432911-1-colin.i.king@gmail.com>
Date: Fri,  1 Aug 2025 16:17:04 +0100
From: Colin Ian King <colin.i.king@...il.com>
To: Jani Nikula <jani.nikula@...ux.intel.com>,
	Rodrigo Vivi <rodrigo.vivi@...el.com>,
	Tvrtko Ursulin <tursulin@...ulin.net>,
	David Airlie <airlied@...il.com>,
	Simona Vetter <simona@...ll.ch>,
	intel-gfx@...ts.freedesktop.org,
	dri-devel@...ts.freedesktop.org
Cc: kernel-janitors@...r.kernel.org,
	linux-kernel@...r.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@...il.com>
---
 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