1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 6a6d1c188030..617888048eed 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -1050,8 +1050,7 @@ static void ide_disk_pre_reset(ide_drive_t *drive)
         drive->special.all = 0;
         drive->special.b.set_geometry = legacy;
         drive->special.b.recalibrate  = legacy;
-        if (OK_TO_RESET_CONTROLLER)
-                drive->mult_count = 0;
+        drive->mult_count = 0;
         if (!drive->keep_settings && !drive->using_dma)
                 drive->mult_req = 0;
         if (drive->mult_req != drive->mult_count)
@@ -1136,7 +1135,6 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
         for (unit = 0; unit < MAX_DRIVES; ++unit)
                 pre_reset(&hwif->drives[unit]);
 
-#if OK_TO_RESET_CONTROLLER
         if (!IDE_CONTROL_REG) {
                 spin_unlock_irqrestore(&ide_lock, flags);
                 return ide_stopped;
@@ -1173,11 +1171,8 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
          * state when the disks are reset this way. At least, the Winbond
          * 553 documentation says that
          */
-        if (hwif->resetproc != NULL) {
+        if (hwif->resetproc)
                 hwif->resetproc(drive);
-        }
-        
-#endif  /* OK_TO_RESET_CONTROLLER */
 
         spin_unlock_irqrestore(&ide_lock, flags);
         return ide_started;