ide: add "flagged" taskfile flags to struct ide_taskfile (v2)

* Add ->ftf_flags field to struct ide_taskfile
  and convert flags for TASKFILE ioctl to use it.

* Rename "flagged" taskfile flags:
  - IDE_TFLAG_FLAGGED -> IDE_FTFLAG_FLAGGED
  - IDE_TFLAG_FLAGGED_SET_IN_FLAGS -> IDE_FTFLAG_SET_IN_FLAGS
  - IDE_TFLAG_{OUT,IN}_DATA -> IDE_FTFLAG_{OUT,IN}_DATA

v2:
* Remember to fully update ide-h8300.c, scc_pata.c and tx493{8,9}ide.c
  (thanks to Stephen Rothwell for noticing).

There should be no functional changes caused by this patch.

Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c
index 9270d3255ee0..11e937485bff 100644
--- a/drivers/ide/ide-h8300.c
+++ b/drivers/ide/ide-h8300.c
@@ -51,10 +51,10 @@ static void h8300_tf_load(ide_drive_t *drive, ide_task_t *task)
         struct ide_taskfile *tf = &task->tf;
         u8 HIHI = (task->tf_flags & IDE_TFLAG_LBA48) ? 0xE0 : 0xEF;
 
-        if (task->tf_flags & IDE_TFLAG_FLAGGED)
+        if (task->ftf_flags & IDE_FTFLAG_FLAGGED)
                 HIHI = 0xFF;
 
-        if (task->tf_flags & IDE_TFLAG_OUT_DATA)
+        if (task->ftf_flags & IDE_FTFLAG_OUT_DATA)
                 mm_outw((tf->hob_data << 8) | tf->data, io_ports->data_addr);
 
         if (task->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
@@ -90,7 +90,7 @@ static void h8300_tf_read(ide_drive_t *drive, ide_task_t *task)
         struct ide_io_ports *io_ports = &hwif->io_ports;
         struct ide_taskfile *tf = &task->tf;
 
-        if (task->tf_flags & IDE_TFLAG_IN_DATA) {
+        if (task->ftf_flags & IDE_FTFLAG_IN_DATA) {
                 u16 data = mm_inw(io_ports->data_addr);
 
                 tf->data = data & 0xff;