ide: move common code out of tf_load() method

Move device register masking (and setting drive->select) out of tf_load() method
and into the only function that needs to use this code, do_rw_taskfile()...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
[bart: fix whitespace error]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 3160be494aa0..0318a4cb09de 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -88,6 +88,16 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
 
                         tp_ops->output_data(drive, cmd, data, 2);
                 }
+
+                if (cmd->valid.out.tf & IDE_VALID_DEVICE) {
+                        u8 HIHI = (cmd->tf_flags & IDE_TFLAG_LBA48) ?
+                                  0xE0 : 0xEF;
+
+                        if (!(cmd->ftf_flags & IDE_FTFLAG_FLAGGED))
+                                cmd->tf.device &= HIHI;
+                        cmd->tf.device |= drive->select;
+                }
+
                 tp_ops->tf_load(drive, cmd);
         }