ide: remove ide_execute_pkt_cmd() (v2)

* Pass command structure to ide_execute_command() and skip
  __ide_set_handler() for ATAPI protocols on non-DRQ devices.

* Convert ide_issue_pc() to always use ide_execute_command()
  and remove no longer needed ide_execute_pkt_cmd().

v2:
* Fix for non-DRQ devices (based on report from Borislav).

There should be no functional changes caused by this patch.

Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 8 insertions, 17 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 52c1258ba9f4..5403e4a44be4 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -451,7 +451,7 @@ EXPORT_SYMBOL(ide_set_handler);
 /**
  *      ide_execute_command     -       execute an IDE command
  *      @drive: IDE drive to issue the command against
- *      @command: command byte to write
+ *      @cmd: command
  *      @handler: handler for next phase
  *      @timeout: timeout for command
  *
@@ -461,15 +461,18 @@ EXPORT_SYMBOL(ide_set_handler);
  *      should go via this function or do equivalent locking.
  */
 
-void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler,
-                         unsigned timeout)
+void ide_execute_command(ide_drive_t *drive, struct ide_cmd *cmd,
+                         ide_handler_t *handler, unsigned timeout)
 {
         ide_hwif_t *hwif = drive->hwif;
         unsigned long flags;
 
         spin_lock_irqsave(&hwif->lock, flags);
-        __ide_set_handler(drive, handler, timeout);
-        hwif->tp_ops->exec_command(hwif, cmd);
+        if ((cmd->protocol != ATAPI_PROT_DMA &&
+             cmd->protocol != ATAPI_PROT_PIO) ||
+            (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT))
+                __ide_set_handler(drive, handler, timeout);
+        hwif->tp_ops->exec_command(hwif, cmd->tf.command);
         /*
          * Drive takes 400nS to respond, we must avoid the IRQ being
          * serviced before that.
@@ -480,18 +483,6 @@ void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler,
         spin_unlock_irqrestore(&hwif->lock, flags);
 }
 
-void ide_execute_pkt_cmd(ide_drive_t *drive)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        unsigned long flags;
-
-        spin_lock_irqsave(&hwif->lock, flags);
-        hwif->tp_ops->exec_command(hwif, ATA_CMD_PACKET);
-        ndelay(400);
-        spin_unlock_irqrestore(&hwif->lock, flags);
-}
-EXPORT_SYMBOL_GPL(ide_execute_pkt_cmd);
-
 /*
  * ide_wait_not_busy() waits for the currently selected device on the hwif
  * to report a non-busy status, see comments in ide_probe_port().