Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ac1e877 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Adrian Bunk
Browse files

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: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent 34814545

drivers/s390/block/dasd.c

+4 −6
Original line number Diff line number Diff line
@@ -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)