aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/block/dasd.c
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-03-24 12:48:13 -0500
committerAdrian Bunk <bunk@stusta.de>2006-03-24 12:48:13 -0500
commit7ac1e877d48061aa6ebca936189c32b44ccf8d9c (patch)
tree2efb95f8cb9d18e56b4e44c089e3f6a1cb483d0d /drivers/s390/block/dasd.c
parent34814545890db603b7648ea2ea477d1f83b61297 (diff)
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>
Diffstat (limited to 'drivers/s390/block/dasd.c')
-rw-r--r--drivers/s390/block/dasd.c10
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,
542 struct dasd_ccw_req *cqr; 542 struct dasd_ccw_req *cqr;
543 543
544 /* Sanity checks */ 544 /* Sanity checks */
545 if ( magic == NULL || datasize > PAGE_SIZE || 545 BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
546 (cplength*sizeof(struct ccw1)) > PAGE_SIZE) 546 (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
547 BUG();
548 547
549 cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC); 548 cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);
550 if (cqr == NULL) 549 if (cqr == NULL)
@@ -584,9 +583,8 @@ dasd_smalloc_request(char *magic, int cplength, int datasize,
584 int size; 583 int size;
585 584
586 /* Sanity checks */ 585 /* Sanity checks */
587 if ( magic == NULL || datasize > PAGE_SIZE || 586 BUG_ON( magic == NULL || datasize > PAGE_SIZE ||
588 (cplength*sizeof(struct ccw1)) > PAGE_SIZE) 587 (cplength*sizeof(struct ccw1)) > PAGE_SIZE);
589 BUG();
590 588
591 size = (sizeof(struct dasd_ccw_req) + 7L) & -8L; 589 size = (sizeof(struct dasd_ccw_req) + 7L) & -8L;
592 if (cplength > 0) 590 if (cplength > 0)