ide: merge flagged_taskfile() into do_rw_taskfile()

Based on the earlier work by Tejun Heo.

task->data_phase == TASKFILE_MULTI_{IN,OUT} vs drive->mult_count == 0
check is needed also for ide_taskfile_ioctl() requests that don't have
IDE_TFLAG_FLAGGED taskfile flag set.

Cc: Tejun Heo <htejun@gmail.com>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 12 insertions, 20 deletions

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 03c4a0c55bf4..1a34edb183ec 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -156,6 +156,18 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
         ide_hwif_t *hwif        = HWIF(drive);
         struct ide_taskfile *tf = &task->tf;
 
+        if (task->data_phase == TASKFILE_MULTI_IN ||
+            task->data_phase == TASKFILE_MULTI_OUT) {
+                if (!drive->mult_count) {
+                        printk(KERN_ERR "%s: multimode not set!\n",
+                                        drive->name);
+                        return ide_stopped;
+                }
+        }
+
+        if (task->tf_flags & IDE_TFLAG_FLAGGED)
+                task->tf_flags |= IDE_TFLAG_FLAGGED_SET_IN_FLAGS;
+
         ide_tf_load(drive, task);
 
         if (task->handler != NULL) {
@@ -839,23 +851,3 @@ int ide_task_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
         return err;
 }
-
-/*
- * NOTICE: This is additions from IBM to provide a discrete interface,
- * for selective taskregister access operations.  Nice JOB Klaus!!!
- * Glad to be able to work and co-develop this with you and IBM.
- */
-ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
-{
-        if (task->data_phase == TASKFILE_MULTI_IN ||
-            task->data_phase == TASKFILE_MULTI_OUT) {
-                if (!drive->mult_count) {
-                        printk(KERN_ERR "%s: multimode not set!\n", drive->name);
-                        return ide_stopped;
-                }
-        }
-
-        task->tf_flags |= IDE_TFLAG_FLAGGED_SET_IN_FLAGS;
-
-        return do_rw_taskfile(drive, task);
-}