8 files changed, 15 insertions, 30 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index abb83d95df57..6de3cd3d6e8e 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1725,8 +1725,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
                 }
         }
 
-        if (HWGROUP(drive)->handler != NULL)
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);
 
         ide_set_handler(drive, cdrom_newpc_intr, rq->timeout, NULL);
         return ide_started;
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index c481be8b807f..783a2475ee8b 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -206,8 +206,7 @@ int ide_build_sglist(ide_drive_t *drive, struct request *rq)
         ide_hwif_t *hwif = HWIF(drive);
         struct scatterlist *sg = hwif->sg_table;
 
-        if ((rq->flags & REQ_DRIVE_TASKFILE) && rq->nr_sectors > 256)
-                BUG();
+        BUG_ON((rq->flags & REQ_DRIVE_TASKFILE) && rq->nr_sectors > 256);
 
         ide_map_sg(drive, rq);
 
@@ -947,8 +946,7 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p
         }
         printk("\n");
 
-        if (!(hwif->dma_master))
-                BUG();
+        BUG_ON(!hwif->dma_master);
 }
 
 EXPORT_SYMBOL_GPL(ide_setup_dma);
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index a53e3ce4a142..a1179e924962 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -898,8 +898,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
                                         "to send us more data than expected "
                                         "- discarding data\n");
                                 idefloppy_discard_data(drive,bcount.all);
-                                if (HWGROUP(drive)->handler != NULL)
-                                        BUG();
+                                BUG_ON(HWGROUP(drive)->handler != NULL);
                                 ide_set_handler(drive,
                                                 &idefloppy_pc_intr,
                                                 IDEFLOPPY_WAIT_CMD,
@@ -932,8 +931,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive)
         pc->actually_transferred += bcount.all;
         pc->current_position += bcount.all;
 
-        if (HWGROUP(drive)->handler != NULL)
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);
         ide_set_handler(drive, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL);           /* And set the interrupt handler again */
         return ide_started;
 }
@@ -960,8 +958,7 @@ static ide_startstop_t idefloppy_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, &idefloppy_pc_intr, IDEFLOPPY_WAIT_CMD, NULL);
         /* Send the actual packet */
@@ -1017,8 +1014,7 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive)
          * 40 and 50msec work well. idefloppy_pc_intr will not be actually
          * used until after the packet is moved in about 50 msec.
          */
-        if (HWGROUP(drive)->handler != NULL)
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);
         ide_set_handler(drive, 
           &idefloppy_pc_intr,           /* service routine for packet command */
           floppy->ticks,                /* wait this long before "failing" */
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index b72dde70840a..97a49e77a8f1 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -939,8 +939,7 @@ void ide_execute_command(ide_drive_t *drive, task_ioreg_t cmd, ide_handler_t *ha
         
         spin_lock_irqsave(&ide_lock, flags);
         
-        if(hwgroup->handler)
-                BUG();
+        BUG_ON(hwgroup->handler);
         hwgroup->handler        = handler;
         hwgroup->expiry         = expiry;
         hwgroup->timer.expires  = jiffies + timeout;
@@ -981,8 +980,7 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive)
                 printk("%s: ATAPI reset complete\n", drive->name);
         } else {
                 if (time_before(jiffies, hwgroup->poll_timeout)) {
-                        if (HWGROUP(drive)->handler != NULL)
-                                BUG();
+                        BUG_ON(HWGROUP(drive)->handler != NULL);
                         ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL);
                         /* continue polling */
                         return ide_started;
@@ -1021,8 +1019,7 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)
 
         if (!OK_STAT(tmp = hwif->INB(IDE_STATUS_REG), 0, BUSY_STAT)) {
                 if (time_before(jiffies, hwgroup->poll_timeout)) {
-                        if (HWGROUP(drive)->handler != NULL)
-                                BUG();
+                        BUG_ON(HWGROUP(drive)->handler != NULL);
                         ide_set_handler(drive, &reset_pollfunc, HZ/20, NULL);
                         /* continue polling */
                         return ide_started;
@@ -1138,8 +1135,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
         hwgroup = HWGROUP(drive);
 
         /* We must not reset with running handlers */
-        if(hwgroup->handler != NULL)
-                BUG();
+        BUG_ON(hwgroup->handler != NULL);
 
         /* For an ATAPI device, first try an ATAPI SRST. */
         if (drive->media != ide_disk && !do_not_try_atapi) {
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 41d46dbe6c24..16a143133f93 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -164,8 +164,7 @@ u8 ide_rate_filter (u8 mode, u8 speed)
 //      printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed);
 
         /* So that we remember to update this if new modes appear */
-        if (mode > 4)
-                BUG();
+        BUG_ON(mode > 4);
         return min(speed, speed_max[mode]);
 #else /* !CONFIG_BLK_DEV_IDEDMA */
         return min(speed, (u8)XFER_PIO_4);
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 9233b8109a0f..a839b2a8f6f4 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -196,8 +196,7 @@ ide_startstop_t set_geometry_intr (ide_drive_t *drive)
         if (stat & (ERR_STAT|DRQ_STAT))
                 return ide_error(drive, "set_geometry_intr", stat);
 
-        if (HWGROUP(drive)->handler != NULL)
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);
         ide_set_handler(drive, &set_geometry_intr, WAIT_WORSTCASE, NULL);
         return ide_started;
 }
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index f5a60912c271..9799aed772e1 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1367,8 +1367,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
 
                         ide_abort(drive, "drive reset");
 
-                        if(HWGROUP(drive)->handler)
-                                BUG();
+                        BUG_ON(HWGROUP(drive)->handler);
                                 
                         /* Ensure nothing gets queued after we
                            drop the lock. Reset will clear the busy */
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index c26c8ca90dd4..fe80295974e1 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -183,8 +183,7 @@ static void trm290_ide_dma_exec_cmd(ide_drive_t *drive, u8 command)
 {
         ide_hwif_t *hwif        = HWIF(drive);
 
-        if (HWGROUP(drive)->handler != NULL)    /* paranoia check */
-                BUG();
+        BUG_ON(HWGROUP(drive)->handler != NULL);        /* paranoia check */
         ide_set_handler(drive, &ide_dma_intr, WAIT_CMD, NULL);
         /* issue cmd to drive */
         hwif->OUTB(command, IDE_COMMAND_REG);