aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/tx4939ide.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:28 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:28 -0400
commit19710d25d50ae0be05eebe4231ed8918b1092d82 (patch)
tree2ec84e215d6dd07afcf3433e8f920bb6919d3f88 /drivers/ide/tx4939ide.c
parentc094ea0774d6881598da430ea0916a597162f8df (diff)
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>
Diffstat (limited to 'drivers/ide/tx4939ide.c')
-rw-r--r--drivers/ide/tx4939ide.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index fb037a5e70b3..f0033eb2e885 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -474,10 +474,10 @@ static void tx4939ide_tf_load(ide_drive_t *drive, ide_task_t *task)
474 struct ide_taskfile *tf = &task->tf; 474 struct ide_taskfile *tf = &task->tf;
475 u8 HIHI = task->tf_flags & IDE_TFLAG_LBA48 ? 0xE0 : 0xEF; 475 u8 HIHI = task->tf_flags & IDE_TFLAG_LBA48 ? 0xE0 : 0xEF;
476 476
477 if (task->tf_flags & IDE_TFLAG_FLAGGED) 477 if (task->ftf_flags & IDE_FTFLAG_FLAGGED)
478 HIHI = 0xFF; 478 HIHI = 0xFF;
479 479
480 if (task->tf_flags & IDE_TFLAG_OUT_DATA) { 480 if (task->ftf_flags & IDE_FTFLAG_OUT_DATA) {
481 u16 data = (tf->hob_data << 8) | tf->data; 481 u16 data = (tf->hob_data << 8) | tf->data;
482 482
483 /* no endian swap */ 483 /* no endian swap */
@@ -519,7 +519,7 @@ static void tx4939ide_tf_read(ide_drive_t *drive, ide_task_t *task)
519 struct ide_io_ports *io_ports = &hwif->io_ports; 519 struct ide_io_ports *io_ports = &hwif->io_ports;
520 struct ide_taskfile *tf = &task->tf; 520 struct ide_taskfile *tf = &task->tf;
521 521
522 if (task->tf_flags & IDE_TFLAG_IN_DATA) { 522 if (task->ftf_flags & IDE_FTFLAG_IN_DATA) {
523 u16 data; 523 u16 data;
524 524
525 /* no endian swap */ 525 /* no endian swap */