ide: set hwif->expiry prior to calling [__]ide_set_handler()

* Set hwif->expiry prior to calling [__]ide_set_handler()
  and drop 'expiry' argument.

* Set hwif->expiry to NULL in ide_{timer_expiry,intr}()
  and remove 'hwif->expiry = NULL' assignments.

There should be no functional changes caused by this patch.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index c3023de7270c..916495ba45df 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -425,26 +425,25 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
  * See also ide_execute_command
  */
 void __ide_set_handler(ide_drive_t *drive, ide_handler_t *handler,
-                       unsigned int timeout, ide_expiry_t *expiry)
+                       unsigned int timeout)
 {
         ide_hwif_t *hwif = drive->hwif;
 
         BUG_ON(hwif->handler);
         hwif->handler           = handler;
-        hwif->expiry            = expiry;
         hwif->timer.expires     = jiffies + timeout;
         hwif->req_gen_timer     = hwif->req_gen;
         add_timer(&hwif->timer);
 }
 
-void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler,
-                      unsigned int timeout, ide_expiry_t *expiry)
+void ide_set_handler(ide_drive_t *drive, ide_handler_t *handler,
+                     unsigned int timeout)
 {
         ide_hwif_t *hwif = drive->hwif;
         unsigned long flags;
 
         spin_lock_irqsave(&hwif->lock, flags);
-        __ide_set_handler(drive, handler, timeout, expiry);
+        __ide_set_handler(drive, handler, timeout);
         spin_unlock_irqrestore(&hwif->lock, flags);
 }
 EXPORT_SYMBOL(ide_set_handler);
@@ -469,8 +468,10 @@ void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler,
         ide_hwif_t *hwif = drive->hwif;
         unsigned long flags;
 
+        hwif->expiry = expiry;
+
         spin_lock_irqsave(&hwif->lock, flags);
-        __ide_set_handler(drive, handler, timeout, expiry);
+        __ide_set_handler(drive, handler, timeout);
         hwif->tp_ops->exec_command(hwif, cmd);
         /*
          * Drive takes 400nS to respond, we must avoid the IRQ being