summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_lib.c
diff options
context:
space:
mode:
authorIgor Stoppa <igor.stoppa@gmail.com>2018-09-05 23:47:20 +0300
committerMartin K. Petersen <martin.petersen@oracle.com>2018-09-17 02:35:34 -0400
commit6f1d8a5327c52570720de9c251bbbe0301903882 (patch)
tree0f20d8ba5a4189b6055a39aa8da9d3d2f18b8d79 /drivers/scsi/scsi_lib.c
parent5227388d599e4c8221193897ff10764b43ee26cb (diff)
downloadlinux-6f1d8a5327c52570720de9c251bbbe0301903882.tar.gz
linux-6f1d8a5327c52570720de9c251bbbe0301903882.tar.bz2
linux-6f1d8a5327c52570720de9c251bbbe0301903882.zip
scsi: core: remove unnecessary unlikely()
BUG_ON() already contains an unlikely(), there is no need for another one. Signed-off-by: Igor Stoppa <igor.stoppa@huawei.com> Cc: "Martin K. Petersen" <martin.petersen@oracle.com> Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com> Cc: linux-scsi@vger.kernel.org CC: linux-kernel@vger.kernel.org Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r--drivers/scsi/scsi_lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 0adfb3bce0fd..aaa1819b0a69 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1207,8 +1207,8 @@ int scsi_init_io(struct scsi_cmnd *cmd)
count = blk_rq_map_integrity_sg(rq->q, rq->bio,
prot_sdb->table.sgl);
- BUG_ON(unlikely(count > ivecs));
- BUG_ON(unlikely(count > queue_max_integrity_segments(rq->q)));
+ BUG_ON(count > ivecs);
+ BUG_ON(count > queue_max_integrity_segments(rq->q));
cmd->prot_sdb = prot_sdb;
cmd->prot_sdb->table.nents = count;