1 files changed, 8 insertions, 13 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 16b1f6e12781..44689f5cc957 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -882,22 +882,17 @@ void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler,
         unsigned long flags;
         ide_hwgroup_t *hwgroup = HWGROUP(drive);
         ide_hwif_t *hwif = HWIF(drive);
-        
+
         spin_lock_irqsave(&ide_lock, flags);
-        
         BUG_ON(hwgroup->handler);
-        hwgroup->handler        = handler;
-        hwgroup->expiry         = expiry;
-        hwgroup->timer.expires  = jiffies + timeout;
-        hwgroup->req_gen_timer = hwgroup->req_gen;
-        add_timer(&hwgroup->timer);
+        __ide_set_handler(drive, handler, timeout, expiry);
         hwif->OUTBSYNC(drive, cmd, IDE_COMMAND_REG);
-        /* Drive takes 400nS to respond, we must avoid the IRQ being
-           serviced before that. 
-           
-           FIXME: we could skip this delay with care on non shared
-           devices 
-        */
+        /*
+         * Drive takes 400nS to respond, we must avoid the IRQ being
+         * serviced before that.
+         *
+         * FIXME: we could skip this delay with care on non shared devices
+         */
         ndelay(400);
         spin_unlock_irqrestore(&ide_lock, flags);
 }