From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Fri, 24 Mar 2006 17:43:26 +0000 (+0100)
Subject: BUG_ON() Conversion in block/elevator.c
X-Git-Tag: v2.6.17-rc1~736^2~8
X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ce52449742697f6f51be2a7c275a4ab2a73885b8;p=linux-2.6-omap-h63xx.git

BUG_ON() Conversion in block/elevator.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>
---

diff --git a/block/elevator.c b/block/elevator.c
index 5e558c4689a..56c2ed06a9e 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -728,8 +728,7 @@ void elv_unregister_queue(struct request_queue *q)
 int elv_register(struct elevator_type *e)
 {
 	spin_lock_irq(&elv_list_lock);
-	if (elevator_find(e->elevator_name))
-		BUG();
+	BUG_ON(elevator_find(e->elevator_name));
 	list_add_tail(&e->list, &elv_list);
 	spin_unlock_irq(&elv_list_lock);