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, 2 insertions, 4 deletions

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index f5cf04cf5712..329fd6f13f79 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -97,8 +97,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
         case ATA_PROT_NODATA:
                 if (handler == NULL)
                         handler = task_no_data_intr;
-                ide_execute_command(drive, tf->command, handler,
-                                    WAIT_WORSTCASE);
+                ide_execute_command(drive, cmd, handler, WAIT_WORSTCASE);
                 return ide_started;
         case ATA_PROT_DMA:
                 if ((drive->dev_flags & IDE_DFLAG_USING_DMA) == 0 ||
@@ -106,8 +105,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
                     dma_ops->dma_setup(drive, cmd))
                         return ide_stopped;
                 hwif->expiry = dma_ops->dma_timer_expiry;
-                ide_execute_command(drive, tf->command, ide_dma_intr,
-                                    2 * WAIT_CMD);
+                ide_execute_command(drive, cmd, ide_dma_intr, 2 * WAIT_CMD);
                 dma_ops->dma_start(drive);
         default:
                 return ide_started;