diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:28 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:28 -0400 |
commit | 19710d25d50ae0be05eebe4231ed8918b1092d82 (patch) | |
tree | 2ec84e215d6dd07afcf3433e8f920bb6919d3f88 /drivers/ide/ns87415.c | |
parent | c094ea0774d6881598da430ea0916a597162f8df (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/ns87415.c')
-rw-r--r-- | drivers/ide/ns87415.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c index ea48a3ee8063..159eb39c7932 100644 --- a/drivers/ide/ns87415.c +++ b/drivers/ide/ns87415.c | |||
@@ -66,7 +66,7 @@ static void superio_tf_read(ide_drive_t *drive, ide_task_t *task) | |||
66 | struct ide_io_ports *io_ports = &drive->hwif->io_ports; | 66 | struct ide_io_ports *io_ports = &drive->hwif->io_ports; |
67 | struct ide_taskfile *tf = &task->tf; | 67 | struct ide_taskfile *tf = &task->tf; |
68 | 68 | ||
69 | if (task->tf_flags & IDE_TFLAG_IN_DATA) { | 69 | if (task->ftf_flags & IDE_FTFLAG_IN_DATA) { |
70 | u16 data = inw(io_ports->data_addr); | 70 | u16 data = inw(io_ports->data_addr); |
71 | 71 | ||
72 | tf->data = data & 0xff; | 72 | tf->data = data & 0xff; |