ide: set IDE_TFLAG_IN_* flags before queuing/executing command

* Add IDE_TFLAG_{HOB,TF,DEVICE} defines.

* Set IDE_TFLAG_IN_* flags in {do_rw,ide_no_data,ide_raw}_taskfile() users.

* Remove no longer needed ->tf_flags setup from ide_end_drive_cmd().

There should be no functionality changes caused by this patch.

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

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index f01b103e55f0..0f3e2f4f9c2c 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -231,7 +231,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
         return ide_stopped;
 
 out_do_tf:
-        args->tf_flags   = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE;
+        args->tf_flags   = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
         args->data_phase = TASKFILE_NO_DATA;
         return do_rw_taskfile(drive, args);
 }
@@ -385,10 +385,6 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
                         tf->error = err;
                         tf->status = stat;
 
-                        args->tf_flags |= (IDE_TFLAG_IN_TF|IDE_TFLAG_IN_DEVICE);
-                        if (args->tf_flags & IDE_TFLAG_LBA48)
-                                args->tf_flags |= IDE_TFLAG_IN_HOB;
-
                         ide_tf_read(drive, args);
                 }
         } else if (blk_pm_request(rq)) {
@@ -712,7 +708,7 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive)
                 return ide_stopped;
         }
 
-        args.tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE |
+        args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE |
                         IDE_TFLAG_CUSTOM_HANDLER;
 
         do_rw_taskfile(drive, &args);