summaryrefslogtreecommitdiff
path: root/drivers/ide/at91_ide.c
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2009-03-31 22:15:31 +0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 22:15:31 +0400
commit35218d1ca808ed19b8c6f079ce91872b3deb2219 (patch)
tree4cc1748e9046ef26701c88b3c6448734f1a7e874 /drivers/ide/at91_ide.c
parentbac08cee93f9cb37b40ecfa8eaf1f6d8daf3909b (diff)
downloadlinux-35218d1ca808ed19b8c6f079ce91872b3deb2219.tar.xz
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/at91_ide.c')
-rw-r--r--drivers/ide/at91_ide.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c
index b7be66d600f8..04b39ff02d76 100644
--- a/drivers/ide/at91_ide.c
+++ b/drivers/ide/at91_ide.c
@@ -195,12 +195,6 @@ static void at91_ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
HIHI = 0xFF;
- if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
- u8 data[2] = { tf->data, tf->hob_data };
-
- at91_ide_output_data(drive, cmd, data, 2);
- }
-
if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
ide_mm_outb(tf->hob_feature, io_ports->feature_addr);
if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
@@ -233,15 +227,6 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
struct ide_io_ports *io_ports = &hwif->io_ports;
struct ide_taskfile *tf = &cmd->tf;
- if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
- u8 data[2];
-
- at91_ide_input_data(drive, cmd, data, 2);
-
- tf->data = data[0];
- tf->hob_data = data[1];
- }
-
/* be sure we're looking at the low order bits */
ide_mm_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);