ide: add PC_FLAG_ZIP_DRIVE pc flag

Add PC_FLAG_ZIP_DRIVE pc flag, set it in idefloppy_do_request()
and check for it (instead of checking for IDEFLOPPY_FLAG_ZIP_DRIVE)
in idefloppy_transfer_pc().  This is a preparation for adding
generic ide_transfer_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>

2 files changed, 7 insertions, 2 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 1df6a3143596..cff90c4b217e 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -559,7 +559,7 @@ static ide_startstop_t idefloppy_transfer_pc1(ide_drive_t *drive)
          * 40 and 50msec work well. idefloppy_pc_intr will not be actually
          * used until after the packet is moved in about 50 msec.
          */
-        if (floppy->flags & IDEFLOPPY_FLAG_ZIP_DRIVE) {
+        if (pc->flags & PC_FLAG_ZIP_DRIVE) {
                 timeout = floppy->ticks;
                 expiry = &idefloppy_transfer_pc2;
         } else {
@@ -575,7 +575,7 @@ static ide_startstop_t idefloppy_transfer_pc1(ide_drive_t *drive)
                 hwif->dma_ops->dma_start(drive);
         }
 
-        if ((floppy->flags & IDEFLOPPY_FLAG_ZIP_DRIVE) == 0)
+        if ((pc->flags & PC_FLAG_ZIP_DRIVE) == 0)
                 /* Send the actual packet */
                 hwif->output_data(drive, NULL, floppy->pc->c, 12);
 
@@ -826,7 +826,11 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive,
                 return ide_stopped;
         }
 
+        if (floppy->flags & IDEFLOPPY_FLAG_ZIP_DRIVE)
+                pc->flags |= PC_FLAG_ZIP_DRIVE;
+
         pc->rq = rq;
+
         return idefloppy_issue_pc(drive, pc);
 }
 
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 63cee2947f60..89feaea9e20b 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -607,6 +607,7 @@ enum {
         PC_FLAG_WRITING                 = (1 << 6),
         /* command timed out */
         PC_FLAG_TIMEDOUT                = (1 << 7),
+        PC_FLAG_ZIP_DRIVE               = (1 << 8),
 };
 
 struct ide_atapi_pc {