[PATCH 21/61] lib/test: Prefer IS_ERR_OR_NULL over manual NULL check
Philipp Hahn <[email protected]>
| Newsgroups | org.kernel.vger.linux-sctp,dev.linux.lists.dm-devel,dev.linux.lists.gfs2,dev.linux.lists.iommu,dev.linux.lists.ntfs3,dev.linux.lists.sched-ext,dev.linux.lists.v9fs,org.freedesktop.lists.amd-gfx,org.freedesktop.lists.dri-devel,org.infradead.lists.linux-mtd,org.infradead.lists.linux-phy,org.infradead.lists.linux-rockchip,org.kernel.vger.bpf,org.kernel.vger.ceph-devel,org.kernel.vger.kvm,org.kernel.vger.linux-block,org.kernel.vger.linux-bluetooth,org.kernel.vger.linux-btrfs,org.kernel.vger.linux-cifs,org.kernel.vger.linux-clk,org.kernel.vger.linux-ext4,org.kernel.vger.linux-fsdevel,org.kernel.vger.linux-gpio,org.kernel.vger.linux-hyperv,org.kernel.vger.linux-input,org.kernel.vger.linux-kernel,org.kernel.vger.linux-leds,org.kernel.vger.linux-media,org.kernel.vger.linux-mips,org.kernel.vger.linux-modules,org.kernel.vger.linux-nfs,org.kernel.vger.linux-omap,org.kernel.vger.linux-pm,org.kernel.vger.linux-s390,org.kernel.vger.linux-scsi,org.kernel.vger.linux-security-module,org.kernel.vger.linux-sh,org.kernel.vger.linux-sound,org.kernel.vger.linux-trace-kernel,org.kernel.vger.linux-usb,org.kernel.vger.linux-wireless,org.kernel.vger.netdev,org.kernel.vger.target-devel,org.kvack.linux-mm,org.osuosl.intel-wired-lan,org.ozlabs.lists.linux-erofs |
|---|---|
| Message-ID | <[email protected]> |
Prefer using IS_ERR_OR_NULL() over using IS_ERR() and a manual NULL check. Change generated with coccinelle. To: Andrew Morton <[email protected]> To: Luis Chamberlain <[email protected]> To: Petr Pavlu <[email protected]> To: Daniel Gomez <[email protected]> To: Sami Tolvanen <[email protected]> To: Aaron Tomlin <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Philipp Hahn <[email protected]> --- 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