7 files changed, 15 insertions, 29 deletions

diff --git a/drivers/scsi/53c700.h b/drivers/scsi/53c700.h
index d8041952b1b5..7f22a06fe5ec 100644
--- a/drivers/scsi/53c700.h
+++ b/drivers/scsi/53c700.h
@@ -474,8 +474,7 @@ NCR_700_readl(struct Scsi_Host *host, __u32 reg)
                 ioread32(hostdata->base + reg);
 #if 1
         /* sanity check the register */
-        if((reg & 0x3) != 0)
-                BUG();
+        BUG_ON((reg & 0x3) != 0);
 #endif
 
         return value;
@@ -498,8 +497,7 @@ NCR_700_writel(__u32 value, struct Scsi_Host *host, __u32 reg)
 
 #if 1
         /* sanity check the register */
-        if((reg & 0x3) != 0)
-                BUG();
+        BUG_ON((reg & 0x3) != 0);
 #endif
 
         bEBus ? iowrite32be(value, hostdata->base + reg): 
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c
index ea9e038813eb..83b5c7d085f2 100644
--- a/drivers/scsi/aacraid/aachba.c
+++ b/drivers/scsi/aacraid/aachba.c
@@ -396,8 +396,7 @@ static void get_container_name_callback(void *context, struct fib * fibptr)
         scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;
 
         dprintk((KERN_DEBUG "get_container_name_callback[cpu %d]: t = %ld.\n", smp_processor_id(), jiffies));
-        if (fibptr == NULL)
-                BUG();
+        BUG_ON(fibptr == NULL);
 
         get_name_reply = (struct aac_get_name_resp *) fib_data(fibptr);
         /* Failure is irrelevant, using default value instead */
@@ -956,8 +955,7 @@ static void io_callback(void *context, struct fib * fibptr)
                   smp_processor_id(), (unsigned long long)lba, jiffies);
         }
 
-        if (fibptr == NULL)
-                BUG();
+        BUG_ON(fibptr == NULL);
                 
         if(scsicmd->use_sg)
                 pci_unmap_sg(dev->pdev, 
@@ -1092,8 +1090,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid)
                 
                 aac_build_sgraw(scsicmd, &readcmd->sg);
                 fibsize = sizeof(struct aac_raw_io) + ((le32_to_cpu(readcmd->sg.count) - 1) * sizeof (struct sgentryraw));
-                if (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr)))
-                        BUG();
+                BUG_ON(fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr)));
                 /*
                  *      Now send the Fib to the adapter
                  */
@@ -1261,8 +1258,7 @@ static int aac_write(struct scsi_cmnd * scsicmd, int cid)
                 
                 aac_build_sgraw(scsicmd, &writecmd->sg);
                 fibsize = sizeof(struct aac_raw_io) + ((le32_to_cpu(writecmd->sg.count) - 1) * sizeof (struct sgentryraw));
-                if (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr)))
-                        BUG();
+                BUG_ON(fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr)));
                 /*
                  *      Now send the Fib to the adapter
                  */
@@ -1904,8 +1900,7 @@ static void aac_srb_callback(void *context, struct fib * fibptr)
         scsicmd->SCp.phase = AAC_OWNER_MIDLEVEL;
         dev = (struct aac_dev *)scsicmd->device->host->hostdata;
 
-        if (fibptr == NULL)
-                BUG();
+        BUG_ON(fibptr == NULL);
 
         srbreply = (struct aac_srb_reply *) fib_data(fibptr);
 
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index d2ef17ea44fa..3f27419c66af 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -229,8 +229,7 @@ void aac_fib_init(struct fib *fibptr)
 static void fib_dealloc(struct fib * fibptr)
 {
         struct hw_fib *hw_fib = fibptr->hw_fib;
-        if(hw_fib->header.StructType != FIB_MAGIC) 
-                BUG();
+        BUG_ON(hw_fib->header.StructType != FIB_MAGIC);
         hw_fib->header.XferState = 0;        
 }
 
@@ -530,8 +529,7 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
                         }
                 } else
                         down(&fibptr->event_wait);
-                if(fibptr->done == 0)
-                        BUG();
+                BUG_ON(fibptr->done == 0);
                         
                 if((fibptr->flags & FIB_CONTEXT_FLAG_TIMED_OUT)){
                         return -ETIMEDOUT;
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);
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index 0c6dc31bb14d..115f55471ed3 100644
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -2241,8 +2241,7 @@ static int __ibmmca_host_reset(Scsi_Cmnd * cmd)
         int host_index;
         unsigned long imm_command;
 
-        if (cmd == NULL)
-                BUG();
+        BUG_ON(cmd == NULL);
 
         ticks = IM_RESET_DELAY * HZ;
         shpnt = cmd->device->host;
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 39b760a24241..988e6f7af01a 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -600,8 +600,7 @@ static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive)
                                 "issuing a packet command\n");
                 return ide_do_reset (drive);
         }
-        if (HWGROUP(drive)->handler != NULL)
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);
         /* Set the interrupt routine */
         ide_set_handler(drive, &idescsi_pc_intr, get_timeout(pc), idescsi_expiry);
         /* Send the actual packet */
@@ -691,8 +690,7 @@ static ide_startstop_t idescsi_issue_pc (ide_drive_t *drive, idescsi_pc_t *pc)
                 set_bit(PC_DMA_OK, &pc->flags);
 
         if (test_bit(IDESCSI_DRQ_INTERRUPT, &scsi->flags)) {
-                if (HWGROUP(drive)->handler != NULL)
-                        BUG();
+                BUG_ON(HWGROUP(drive)->handler != NULL);
                 ide_set_handler(drive, &idescsi_transfer_pc,
                                 get_timeout(pc), idescsi_expiry);
                 /* Issue the packet command */
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index c33857e7b33b..5d2cefb5e52d 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1828,7 +1828,7 @@ mega_build_sglist(adapter_t *adapter, scb_t *scb, u32 *buf, u32 *len)
 
         scb->dma_type = MEGA_SGLIST;
 
-        if( sgcnt > adapter->sglen ) BUG();
+        BUG_ON(sgcnt > adapter->sglen);
 
         *len = 0;