1 files changed, 4 insertions, 8 deletions

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" */