From 79b07ad0c36e0bd23d0c73c9222f5c3b722effb2 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 21 Dec 2019 02:55:40 +0000 Subject: [PATCH] scst: Remove three superfluous unlikely() annotations This was detected by checkpatch. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8689 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_lib.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index fca89fd62..a0b69aa02 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -8294,7 +8294,7 @@ static struct request *__blk_map_kern_sg(struct request_queue *q, } rq = blk_make_request(q, hbio, gfp_mask); - if (unlikely(IS_ERR(rq))) + if (IS_ERR(rq)) goto out_free_bios; #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) @@ -8371,11 +8371,11 @@ static struct request *blk_map_kern_sg(struct request_queue *q, } rq = __blk_map_kern_sg(q, sgl, nents, NULL, gfp, reading); - if (unlikely(IS_ERR(rq))) { + if (IS_ERR(rq)) { struct blk_kern_sg_work *bw; bw = blk_copy_kern_sg(q, sgl, nents, gfp, reading); - if (unlikely(IS_ERR(bw))) { + if (IS_ERR(bw)) { rq = ERR_PTR(PTR_ERR(bw)); goto out; }