ide: remove 'tf_in_flags' field from ide_task_t

* Add IDE_TFLAG_IN_DATA taskfile flag to indicate the need of reading
  IDE_DATA_REG in ide_end_drive_cmd().

  Set the new flag in ide_taskfile_ioctl() if ->in_flags.b.data is set.

* Add IDE_TFLAG_FLAGGED_SET_IN_FLAGS taskfile flag to indicate the
  need of modifying ->in_flags in ide_taskfile_ioctl().

  Set the new flag in flagged_taskfile() and move the code modifying
  ->tf_in_flags to ide_taskfile_ioctl().

  While at it remove the bogus comment: ->tf_in_flags (except .b.data)
  have no effect on selection of registers to read.

* Remove no longer needed 'tf_in_flags' field from ide_task_t.

As the result we finally have the internals of HDIO_DRIVE_TASKFILE ioctl
separated from the core IDE code.

There should be no functionality changes caused by this patch.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 7485fc705ca4..c23ef2df2cbb 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -910,6 +910,8 @@ enum {
                                           IDE_TFLAG_OUT_LBAH,
         IDE_TFLAG_OUT_DEVICE            = (1 << 14),
         IDE_TFLAG_WRITE                 = (1 << 15),
+        IDE_TFLAG_FLAGGED_SET_IN_FLAGS  = (1 << 16),
+        IDE_TFLAG_IN_DATA               = (1 << 17),
 };
 
 struct ide_taskfile {
@@ -946,8 +948,7 @@ typedef struct ide_task_s {
                 struct ide_taskfile     tf;
                 u8                      tf_array[14];
         };
-        u16                     tf_flags;
-        ide_reg_valid_t         tf_in_flags;
+        u32                     tf_flags;
         int                     data_phase;
         ide_pre_handler_t       *prehandler;
         ide_handler_t           *handler;