aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-iops.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r--drivers/ide/ide-iops.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 916495ba45df..52c1258ba9f4 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -454,7 +454,6 @@ EXPORT_SYMBOL(ide_set_handler);
454 * @command: command byte to write 454 * @command: command byte to write
455 * @handler: handler for next phase 455 * @handler: handler for next phase
456 * @timeout: timeout for command 456 * @timeout: timeout for command
457 * @expiry: handler to run on timeout
458 * 457 *
459 * Helper function to issue an IDE command. This handles the 458 * Helper function to issue an IDE command. This handles the
460 * atomicity requirements, command timing and ensures that the 459 * atomicity requirements, command timing and ensures that the
@@ -463,13 +462,11 @@ EXPORT_SYMBOL(ide_set_handler);
463 */ 462 */
464 463
465void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler, 464void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler,
466 unsigned timeout, ide_expiry_t *expiry) 465 unsigned timeout)
467{ 466{
468 ide_hwif_t *hwif = drive->hwif; 467 ide_hwif_t *hwif = drive->hwif;
469 unsigned long flags; 468 unsigned long flags;
470 469
471 hwif->expiry = expiry;
472
473 spin_lock_irqsave(&hwif->lock, flags); 470 spin_lock_irqsave(&hwif->lock, flags);
474 __ide_set_handler(drive, handler, timeout); 471 __ide_set_handler(drive, handler, timeout);
475 hwif->tp_ops->exec_command(hwif, cmd); 472 hwif->tp_ops->exec_command(hwif, cmd);
@@ -482,7 +479,6 @@ void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler,
482 ndelay(400); 479 ndelay(400);
483 spin_unlock_irqrestore(&hwif->lock, flags); 480 spin_unlock_irqrestore(&hwif->lock, flags);
484} 481}
485EXPORT_SYMBOL(ide_execute_command);
486 482
487void ide_execute_pkt_cmd(ide_drive_t *drive) 483void ide_execute_pkt_cmd(ide_drive_t *drive)
488{ 484{