4:25 a.m.
From: kernel test robot <lkp(a)intel.com>
drivers/block/pktcdvd.c:1073:3-6: WARNING: Use BUG_ON
drivers/block/pktcdvd.c:1313:3-6: WARNING: Use BUG_ON
Use BUG_ON instead of a if condition followed by BUG.
Semantic patch information:
This makes an effort to find cases where BUG() follows an if
condition on an expression and replaces the if condition and BUG()
with a BUG_ON having the conditional expression of the if statement
as argument.
Generated by: scripts/coccinelle/misc/bugon.cocci
Fixes: 8214bf079208 ("scripts/dtc: Export YYLOC global declaration")
Reported-by: kernel test robot <lkp(a)intel.com>
Signed-off-by: kernel test robot <lkp(a)intel.com>
---
tree: https://android.googlesource.com/kernel/goldfish android-3.18
head: dd54b61f1458c03f68fc019b4874d98f2f0ae3a5
commit: 8214bf079208b146e63cd0a3ce0ed335a87ce7b3 [396/1051] scripts/dtc: Export YYLOC
global declaration
:::::: branch date: 5 weeks ago
:::::: commit date: 3 months ago
Please take the patch only if it's a positive warning. Thanks!
pktcdvd.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -1069,8 +1069,7 @@ static void pkt_gather_data(struct pktcd
offset = (f * CD_FRAMESIZE) % PAGE_SIZE;
pkt_dbg(2, pd, "Adding frame %d, page:%p offs:%d\n",
f, pkt->pages[p], offset);
- if (!bio_add_page(bio, pkt->pages[p], CD_FRAMESIZE, offset))
- BUG();
+ BUG_ON(!bio_add_page(bio, pkt->pages[p], CD_FRAMESIZE, offset));
atomic_inc(&pkt->io_wait);
bio->bi_rw = READ;
@@ -1309,8 +1308,7 @@ static void pkt_start_write(struct pktcd
for (f = 0; f < pkt->frames; f++) {
bvec[f].bv_page = pkt->pages[(f * CD_FRAMESIZE) / PAGE_SIZE];
bvec[f].bv_offset = (f * CD_FRAMESIZE) % PAGE_SIZE;
- if (!bio_add_page(pkt->w_bio, bvec[f].bv_page, CD_FRAMESIZE, bvec[f].bv_offset))
- BUG();
+ BUG_ON(!bio_add_page(pkt->w_bio, bvec[f].bv_page, CD_FRAMESIZE,
bvec[f].bv_offset));
}
pkt_dbg(2, pd, "vcnt=%d\n", pkt->w_bio->bi_vcnt);