ide: add PC_FLAG_DRQ_INTERRUPT pc flag

Add PC_FLAG_DRQ_INTERRUPT pc flag, set it in ide*_do_request()
and check for it (instead of checking for IDE*_FLAG_DRQ_INTERRUPT)
in ide*_issue_pc().  This is a preparation for adding generic
ide_issue_pc() helper.

There should be no functional changes caused by this patch.

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

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 1d261298d61a..b7c5e8391575 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -525,7 +525,7 @@ static ide_startstop_t idescsi_issue_pc(ide_drive_t *drive,
 
         ide_pktcmd_tf_load(drive, 0, bcount, dma);
 
-        if (test_bit(IDESCSI_DRQ_INTERRUPT, &scsi->flags)) {
+        if (pc->flags & PC_FLAG_DRQ_INTERRUPT) {
                 ide_execute_command(drive, WIN_PACKETCMD, &idescsi_transfer_pc,
                                     get_timeout(pc), idescsi_expiry);
                 return ide_started;
@@ -548,6 +548,10 @@ static ide_startstop_t idescsi_do_request (ide_drive_t *drive, struct request *r
 
         if (blk_sense_request(rq) || blk_special_request(rq)) {
                 struct ide_atapi_pc *pc = (struct ide_atapi_pc *)rq->special;
+                idescsi_scsi_t *scsi = drive_to_idescsi(drive);
+
+                if (test_bit(IDESCSI_DRQ_INTERRUPT, &scsi->flags))
+                        pc->flags |= PC_FLAG_DRQ_INTERRUPT;
 
                 if (drive->using_dma && !idescsi_map_sg(drive, pc))
                         pc->flags |= PC_FLAG_DMA_OK;