BUG_ON() Conversion in drivers/s390/block/dasd.c

this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index dfe542b206cc..0eab05a37e65 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -542,9 +542,8 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize,
         struct dasd_ccw_req *cqr;
 
         /* Sanity checks */
-        if ( magic == NULL || datasize > PAGE_SIZE ||
-             (cplength*sizeof(struct ccw1)) > PAGE_SIZE)
-                BUG();
+        BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
+             (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
 
         cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);
         if (cqr == NULL)
@@ -584,9 +583,8 @@ dasd_smalloc_request(char *magic, int cplength, int datasize,
         int size;
 
         /* Sanity checks */
-        if ( magic == NULL || datasize > PAGE_SIZE ||
-             (cplength*sizeof(struct ccw1)) > PAGE_SIZE)
-                BUG();
+        BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
+             (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
 
         size = (sizeof(struct dasd_ccw_req) + 7L) & -8L;
         if (cplength > 0)