diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:14 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:14 -0500 |
commit | 866e2ec9ce525de0e7c10d02ead8d85af27adffd (patch) | |
tree | a8bdbcd6405bc9eb5aecaeb68fdcf899e205401c /include | |
parent | ac026ff254b32915bb14ba97a23b4019d137f181 (diff) |
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ide.h | 5 |
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 { | |||
910 | IDE_TFLAG_OUT_LBAH, | 910 | IDE_TFLAG_OUT_LBAH, |
911 | IDE_TFLAG_OUT_DEVICE = (1 << 14), | 911 | IDE_TFLAG_OUT_DEVICE = (1 << 14), |
912 | IDE_TFLAG_WRITE = (1 << 15), | 912 | IDE_TFLAG_WRITE = (1 << 15), |
913 | IDE_TFLAG_FLAGGED_SET_IN_FLAGS = (1 << 16), | ||
914 | IDE_TFLAG_IN_DATA = (1 << 17), | ||
913 | }; | 915 | }; |
914 | 916 | ||
915 | struct ide_taskfile { | 917 | struct ide_taskfile { |
@@ -946,8 +948,7 @@ typedef struct ide_task_s { | |||
946 | struct ide_taskfile tf; | 948 | struct ide_taskfile tf; |
947 | u8 tf_array[14]; | 949 | u8 tf_array[14]; |
948 | }; | 950 | }; |
949 | u16 tf_flags; | 951 | u32 tf_flags; |
950 | ide_reg_valid_t tf_in_flags; | ||
951 | int data_phase; | 952 | int data_phase; |
952 | ide_pre_handler_t *prehandler; | 953 | ide_pre_handler_t *prehandler; |
953 | ide_handler_t *handler; | 954 | ide_handler_t *handler; |