[PATCH] More BUG_ON conversion

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Acked-by: "Salyzyn, Mark" <mark_salyzyn@adaptec.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/scsi/arm/queue.c b/drivers/scsi/arm/queue.c
index b10750bb5c09..8caa5903ce38 100644
--- a/drivers/scsi/arm/queue.c
+++ b/drivers/scsi/arm/queue.c
@@ -118,8 +118,7 @@ int __queue_add(Queue_t *queue, Scsi_Cmnd *SCpnt, int head)
         list_del(l);
 
         q = list_entry(l, QE_t, list);
-        if (BAD_MAGIC(q, QUEUE_MAGIC_FREE))
-                BUG();
+        BUG_ON(BAD_MAGIC(q, QUEUE_MAGIC_FREE));
 
         SET_MAGIC(q, QUEUE_MAGIC_USED);
         q->SCpnt = SCpnt;
@@ -144,8 +143,7 @@ static Scsi_Cmnd *__queue_remove(Queue_t *queue, struct list_head *ent)
          */
         list_del(ent);
         q = list_entry(ent, QE_t, list);
-        if (BAD_MAGIC(q, QUEUE_MAGIC_USED))
-                BUG();
+        BUG_ON(BAD_MAGIC(q, QUEUE_MAGIC_USED));
 
         SET_MAGIC(q, QUEUE_MAGIC_FREE);
         list_add(ent, &queue->free);