Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=14b89ef9814614f18a1fcae51e601e7e16a82ef7
Commit:     14b89ef9814614f18a1fcae51e601e7e16a82ef7
Parent:     813a0eb233ee67d7166241a8b389b6a76f2247f9
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Fri Jan 25 22:17:11 2008 +0100
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 22:17:11 2008 +0100

    ide: switch ide_task_ioctl() to use REQ_TYPE_ATA_TASKFILE requests
    
    Based on the earlier work by Tejun Heo.
    
    There should be no functionality changes caused by this patch.
    
    Cc: Tejun Heo <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/ide-taskfile.c |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 7ae4a42..7c8e980 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -806,28 +806,29 @@ abort:
        return err;
 }
 
-static int ide_wait_cmd_task(ide_drive_t *drive, u8 *buf)
-{
-       struct request rq;
-
-       ide_init_drive_cmd(&rq);
-       rq.cmd_type = REQ_TYPE_ATA_TASK;
-       rq.buffer = buf;
-       return ide_do_drive_cmd(drive, &rq, ide_wait);
-}
-
 int ide_task_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 {
        void __user *p = (void __user *)arg;
        int err = 0;
-       u8 args[7], *argbuf = args;
-       int argsize = 7;
+       u8 args[7];
+       ide_task_t task;
 
        if (copy_from_user(args, p, 7))
                return -EFAULT;
-       err = ide_wait_cmd_task(drive, argbuf);
-       if (copy_to_user(p, argbuf, argsize))
+
+       memset(&task, 0, sizeof(task));
+       memcpy(&task.tf_array[7], &args[1], 6);
+       task.tf.command = args[0];
+       task.tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE;
+
+       err = ide_no_data_taskfile(drive, &task);
+
+       args[0] = task.tf.command;
+       memcpy(&args[1], &task.tf_array[7], 6);
+
+       if (copy_to_user(p, args, 7))
                err = -EFAULT;
+
        return err;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to