Re: [PATCH 2.6.11-rc3 09/11] ide: convert uses of REQ_DRIVE_CMD to REQ_DRIVE_TASKFILE

[Tejun Heo <htejun@gmail.com>]

09_ide_taskfile_cmd.patch

	All in-kernel REQ_DRIVE_CMD users except for ide_cmd_ioctl()
	converted to use REQ_DRIVE_TASKFILE.

Signed-off-by: Tejun Heo <htejun@gmail.com>

 ide-disk.c |    1 -
 ide.c      |   15 ++++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

Index: linux-ide/drivers/ide/ide-disk.c
===================================================================
--- linux-ide.orig/drivers/ide/ide-disk.c	2005-02-10 17:38:01.744804960 +0900
+++ linux-ide/drivers/ide/ide-disk.c	2005-02-10 17:38:02.415692451 +0900
@@ -723,7 +723,6 @@ static int set_multcount(ide_drive_t *dr
 	if (drive->special.b.set_multmode)
 		return -EBUSY;
 	ide_init_drive_cmd (&rq);
-	rq.flags = REQ_DRIVE_CMD;
 	drive->mult_req = arg;
 	drive->special.b.set_multmode = 1;
 	(void) ide_do_drive_cmd (drive, &rq, ide_wait);
Index: linux-ide/drivers/ide/ide.c
===================================================================
--- linux-ide.orig/drivers/ide/ide.c	2005-02-10 17:31:48.305767251 +0900
+++ linux-ide/drivers/ide/ide.c	2005-02-10 17:38:02.416692284 +0900
@@ -1250,9 +1250,18 @@ static int set_pio_mode (ide_drive_t *dr
 
 static int set_xfer_rate (ide_drive_t *drive, int arg)
 {
-	int err = ide_wait_cmd(drive,
-			WIN_SETFEATURES, (u8) arg,
-			SETFEATURES_XFER, 0, NULL);
+	ide_task_t task;
+	int err;
+
+	memset(&task, 0, sizeof(task));
+	task.tfRegister[IDE_COMMAND_OFFSET]	= WIN_SETFEATURES;
+	task.tfRegister[IDE_FEATURE_OFFSET]	= SETFEATURES_XFER;
+	task.tfRegister[IDE_NSECTOR_OFFSET]	= arg;
+	task.command_type			= IDE_DRIVE_TASK_NO_DATA;
+	task.data_phase				= TASKFILE_NO_DATA;
+	task.handler				= task_no_data_intr;
+
+	err = ide_raw_taskfile(drive, &task, NULL);
 
 	if (!err && arg) {
 		ide_set_xfer_rate(drive, (u8) arg);