aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/block/dasd_devmap.c
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-03-26 11:33:07 -0500
committerAdrian Bunk <bunk@stusta.de>2006-03-26 11:33:07 -0500
commit606f44228e257ea1e35557c2fec7133cca634096 (patch)
treed9cb9c5173079c1d03f917ab7e81871f0c226368 /drivers/s390/block/dasd_devmap.c
parentf02e1fafb534459522a8c46bc46b32820684623e (diff)
BUG_ON() Conversion in drivers/s390/block/dasd_devmap.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_devmap.c')
-rw-r--r--drivers/s390/block/dasd_devmap.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index 2f720108a7e0..c1c6f1381150 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -437,8 +437,7 @@ dasd_forget_ranges(void)
437 spin_lock(&dasd_devmap_lock); 437 spin_lock(&dasd_devmap_lock);
438 for (i = 0; i < 256; i++) { 438 for (i = 0; i < 256; i++) {
439 list_for_each_entry_safe(devmap, n, &dasd_hashlists[i], list) { 439 list_for_each_entry_safe(devmap, n, &dasd_hashlists[i], list) {
440 if (devmap->device != NULL) 440 BUG_ON(devmap->device != NULL);
441 BUG();
442 list_del(&devmap->list); 441 list_del(&devmap->list);
443 kfree(devmap); 442 kfree(devmap);
444 } 443 }
@@ -547,8 +546,7 @@ dasd_delete_device(struct dasd_device *device)
547 546
548 /* First remove device pointer from devmap. */ 547 /* First remove device pointer from devmap. */
549 devmap = dasd_find_busid(device->cdev->dev.bus_id); 548 devmap = dasd_find_busid(device->cdev->dev.bus_id);
550 if (IS_ERR(devmap)) 549 BUG_ON(IS_ERR(devmap));
551 BUG();
552 spin_lock(&dasd_devmap_lock); 550 spin_lock(&dasd_devmap_lock);
553 if (devmap->device != device) { 551 if (devmap->device != device) {
554 spin_unlock(&dasd_devmap_lock); 552 spin_unlock(&dasd_devmap_lock);