diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2009-03-31 14:15:31 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-31 14:15:31 -0400 |
commit | 35218d1ca808ed19b8c6f079ce91872b3deb2219 (patch) | |
tree | 4cc1748e9046ef26701c88b3c6448734f1a7e874 /drivers/ide/ns87415.c | |
parent | bac08cee93f9cb37b40ecfa8eaf1f6d8daf3909b (diff) |
ide: move data register access out of tf_{read|load}() methods (take 2)
Move IDE_FTFLAG_{IN|OUT}_DATA flag handling out of tf_{read|load}() methods
into the only two functions where these flags actually need to be handled:
do_rw_taskfile() and ide_complete_cmd()...
Signed-off-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 | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c index 7d64bc079fa8..9f6dff83b141 100644 --- a/drivers/ide/ns87415.c +++ b/drivers/ide/ns87415.c | |||
@@ -66,15 +66,6 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) | |||
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 = &cmd->tf; | 67 | struct ide_taskfile *tf = &cmd->tf; |
68 | 68 | ||
69 | if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) { | ||
70 | u8 data[2]; | ||
71 | |||
72 | ide_input_data(drive, cmd, data, 2); | ||
73 | |||
74 | tf->data = data[0]; | ||
75 | tf->hob_data = data[1]; | ||
76 | } | ||
77 | |||
78 | /* be sure we're looking at the low order bits */ | 69 | /* be sure we're looking at the low order bits */ |
79 | outb(ATA_DEVCTL_OBS, io_ports->ctl_addr); | 70 | outb(ATA_DEVCTL_OBS, io_ports->ctl_addr); |
80 | 71 | ||