aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/arm/queue.c
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-06-23 05:06:06 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:43:08 -0400
commit125e18745f16685f69a34fd6130d47598fc4bf54 (patch)
treec97ed94b0525a572efa1bd4990a55b18be5d781d /drivers/scsi/arm/queue.c
parent78ce89c92bc6eaf5933b5664bff64253a7103bd7 (diff)
[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>
Diffstat (limited to 'drivers/scsi/arm/queue.c')
-rw-r--r--drivers/scsi/arm/queue.c6
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)
118 list_del(l); 118 list_del(l);
119 119
120 q = list_entry(l, QE_t, list); 120 q = list_entry(l, QE_t, list);
121 if (BAD_MAGIC(q, QUEUE_MAGIC_FREE)) 121 BUG_ON(BAD_MAGIC(q, QUEUE_MAGIC_FREE));
122 BUG();
123 122
124 SET_MAGIC(q, QUEUE_MAGIC_USED); 123 SET_MAGIC(q, QUEUE_MAGIC_USED);
125 q->SCpnt = SCpnt; 124 q->SCpnt = SCpnt;
@@ -144,8 +143,7 @@ static Scsi_Cmnd *__queue_remove(Queue_t *queue, struct list_head *ent)
144 */ 143 */
145 list_del(ent); 144 list_del(ent);
146 q = list_entry(ent, QE_t, list); 145 q = list_entry(ent, QE_t, list);
147 if (BAD_MAGIC(q, QUEUE_MAGIC_USED)) 146 BUG_ON(BAD_MAGIC(q, QUEUE_MAGIC_USED));
148 BUG();
149 147
150 SET_MAGIC(q, QUEUE_MAGIC_FREE); 148 SET_MAGIC(q, QUEUE_MAGIC_FREE);
151 list_add(ent, &queue->free); 149 list_add(ent, &queue->free);