[PATCH 21/61] lib/test: Prefer IS_ERR_OR_NULL over manual NULL check
From: Philipp Hahn <hidden>
Date: 2026-03-10 11:55:42
Also in:
amd-gfx, bpf, ceph-devel, dm-devel, dri-devel, gfs2, intel-wired-lan, kvm, linux-block, linux-bluetooth, linux-btrfs, linux-cifs, linux-clk, linux-ext4, linux-fsdevel, linux-gpio, linux-hyperv, linux-input, linux-leds, linux-media, linux-mips, linux-mm, linux-modules, linux-nfs, linux-omap, linux-phy, linux-pm, linux-rockchip, linux-s390, linux-scsi, linux-sctp, linux-security-module, linux-sh, linux-sound, linux-trace-kernel, linux-usb, linux-wireless, lkml, netdev, ntfs3, sched-ext, target-devel, v9fs
Subsystem:
library code, module support, the rest · Maintainers:
Andrew Morton, Luis Chamberlain, Petr Pavlu, Daniel Gomez, Sami Tolvanen, Linus Torvalds
Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL check. Change generated with coccinelle. To: Andrew Morton <akpm@linux-foundation.org> To: Luis Chamberlain <mcgrof@kernel.org> To: Petr Pavlu <petr.pavlu@suse.com> To: Daniel Gomez <da.gomez@kernel.org> To: Sami Tolvanen <samitolvanen@google.com> To: Aaron Tomlin <atomlin@atomlin.com> Cc: linux-kernel@vger.kernel.org Cc: linux-modules@vger.kernel.org Signed-off-by: Philipp Hahn <redacted> --- lib/test_firmware.c | 2 +- lib/test_kmod.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index b471d720879a70c0db82e605960abe69de28ab4b..fc3177927a02e2d7849915309048529395ece0f8 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c@@ -955,7 +955,7 @@ static ssize_t trigger_batched_requests_store(struct device *dev, init_completion(&req->completion); req->task = kthread_run(test_fw_run_batch_request, req, "%s-%u", KBUILD_MODNAME, req->idx); - if (!req->task || IS_ERR(req->task)) { + if (IS_ERR_OR_NULL(req->task)) { pr_err("Setting up thread %u failed\n", req->idx); req->task = NULL; rc = -ENOMEM;
diff --git a/lib/test_kmod.c b/lib/test_kmod.c
index f0dd092860ea6f9c69a71e10cb1c8b071b1cd1b7..f44a181f6f1ab53cf95a0a0b598b88cb5f8f369d 100644
--- a/lib/test_kmod.c
+++ b/lib/test_kmod.c@@ -327,7 +327,7 @@ static int try_one_request(struct kmod_test_device *test_dev, unsigned int idx) info->task_sync = kthread_run(run_request, info, "%s-%u", KBUILD_MODNAME, idx); - if (!info->task_sync || IS_ERR(info->task_sync)) { + if (IS_ERR_OR_NULL(info->task_sync)) { test_dev->test_is_oom = true; dev_err(test_dev->dev, "Setting up thread %u failed\n", idx); info->task_sync = NULL;
@@ -358,7 +358,7 @@ static void test_dev_kmod_stop_tests(struct kmod_test_device *test_dev) for (i=0; i < config->num_threads; i++) { info = &test_dev->info[i]; - if (info->task_sync && !IS_ERR(info->task_sync)) { + if (!IS_ERR_OR_NULL(info->task_sync)) { dev_info(test_dev->dev, "Stopping still-running thread %i\n", i); kthread_stop(info->task_sync);
--
2.43.0