Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6f1d8a5327c52570720de9c251bbbe0301903882

Authored by Igor Stoppa
Committed by Martin K. Petersen
1 parent 5227388d59

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/scsi/scsi_lib.c
Diff comments   View file @ 6f1d8a5
... ... @@ -1207,8 +1207,8 @@
1207 1207  
1208 1208 count = blk_rq_map_integrity_sg(rq->q, rq->bio,
1209 1209 prot_sdb->table.sgl);
1210   - BUG_ON(unlikely(count > ivecs));
1211   - BUG_ON(unlikely(count > queue_max_integrity_segments(rq->q)));
  1210 + BUG_ON(count > ivecs);
  1211 + BUG_ON(count > queue_max_integrity_segments(rq->q));
1212 1212  
1213 1213 cmd->prot_sdb = prot_sdb;
1214 1214 cmd->prot_sdb->table.nents = count;