Skip to contentSkip to conversation

BUG_ON() Conversion in

PATCH New Eric Sesterhenn / snakebyte 1 participant 1 message Jan 31, 2006

Subsystems (3)
Kernel janitors s390 s390 DASD driver
lore
Share & tools
lore

Eric Sesterhenn / snakebyte

author
#0 lore raw

PATCH 2/5 BUG_ON() Conversion in

hi,

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

Signed-off-by Eric Sesterhenn <[email protected]>
drivers/s390/block/dasd_devmap.c renamed from drivers/s390/block/dasd_devmap.c.orig +2 -4
@@ -435,8 +435,7 @@ dasd_forget_ranges(void)
 	spin_lock(&dasd_devmap_lock);
 	for (i = 0; i < 256; i++) {
 		list_for_each_entry_safe(devmap, n, &dasd_hashlists[i], list) {
-			if (devmap->device != NULL)
-				BUG();
+			BUG_ON(devmap->device != NULL);
 			list_del(&devmap->list);
 			kfree(devmap);
 		}

@@ -545,8 +544,7 @@ dasd_delete_device(struct dasd_device *d
 
 	/* First remove device pointer from devmap. */
 	devmap = dasd_find_busid(device->cdev->dev.bus_id);
-	if (IS_ERR(devmap))
-		BUG();
+	BUG_ON(IS_ERR(devmap));
 	spin_lock(&dasd_devmap_lock);
 	if (devmap->device != device) {
 		spin_unlock(&dasd_devmap_lock);

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors