ide: use generic ATAPI packet command flags in ide-{floppy,tape}

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

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index bf1ef60a5a07654d26aca0e36f09c6327f50f72a..5f133dfb541c5e7fe4c406ef8e0775eb8a70598a 100644 (file)
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -78,20 +78,6 @@
  */
 #define IDEFLOPPY_PC_STACK             (10 + IDEFLOPPY_MAX_PC_RETRIES)
 
-/* Packet command flag bits. */
-enum {
-       /* 1 when we prefer to use DMA if possible */
-       PC_FLAG_DMA_RECOMMENDED = (1 << 0),
-       /* 1 while DMA in progress */
-       PC_FLAG_DMA_IN_PROGRESS = (1 << 1),
-       /* 1 when encountered problem during DMA */
-       PC_FLAG_DMA_ERROR       = (1 << 2),
-       /* Data direction */
-       PC_FLAG_WRITING         = (1 << 3),
-       /* Suppress error reporting */
-       PC_FLAG_SUPPRESS_ERROR  = (1 << 4),
-};
-
 /* format capacities descriptor codes */
 #define CAPACITY_INVALID       0x00
 #define CAPACITY_UNFORMATTED   0x01

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 3f9dcca6f092680e3829332932a570ad64c8aaa5..f43fd070f1b6d0c7221f8ab86a1ff89c913ac4cf 100644 (file)
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -181,22 +181,6 @@ struct idetape_bh {
        char *b_data;
 };
 
-/* Packet command flag bits. */
-enum {
-       /* Set when an error is considered normal - We won't retry */
-       PC_FLAG_ABORT           = (1 << 0),
-       /* 1 When polling for DSC on a media access command */
-       PC_FLAG_WAIT_FOR_DSC    = (1 << 1),
-       /* 1 when we prefer to use DMA if possible */
-       PC_FLAG_DMA_RECOMMENDED = (1 << 2),
-       /* 1 while DMA in progress */
-       PC_FLAG_DMA_IN_PROGRESS = (1 << 3),
-       /* 1 when encountered problem during DMA */
-       PC_FLAG_DMA_ERROR       = (1 << 4),
-       /* Data direction */
-       PC_FLAG_WRITING         = (1 << 5),
-};
-
 /* Tape door status */
 #define DOOR_UNLOCKED                  0
 #define DOOR_LOCKED                    1

diff --git a/include/linux/ide.h b/include/linux/ide.h
index e9b1def1e66abd7b2e536ed8c0eeb83e21f836dc..65445b7efc630a3c8c3c0dbfcd61f3de741eea0a 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -595,6 +595,21 @@ int set_io_32bit(ide_drive_t *, int);
 int set_pio_mode(ide_drive_t *, int);
 int set_using_dma(ide_drive_t *, int);
 
+/* ATAPI packet command flags */
+enum {
+       /* set when an error is considered normal - no retry (ide-tape) */
+       PC_FLAG_ABORT                   = (1 << 0),
+       PC_FLAG_SUPPRESS_ERROR          = (1 << 1),
+       PC_FLAG_WAIT_FOR_DSC            = (1 << 2),
+       PC_FLAG_DMA_OK                  = (1 << 3),
+       PC_FLAG_DMA_RECOMMENDED         = (1 << 4),
+       PC_FLAG_DMA_IN_PROGRESS         = (1 << 5),
+       PC_FLAG_DMA_ERROR               = (1 << 6),
+       PC_FLAG_WRITING                 = (1 << 7),
+       /* command timed out */
+       PC_FLAG_TIMEDOUT                = (1 << 8),
+};
+
 struct ide_atapi_pc {
        /* actual packet bytes */
        u8 c[12];