lkml.org 
[lkml]   [2005]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH 2.6.11-rc3 02/11] ide: ide_init_drive_cmd() now defaults to REQ_DRIVE_TASKFILE
From
Date

02_ide_taskfile_init_drive_cmd.patch

ide_init_drive_cmd() now initializes rq->flags to
REQ_DRIVE_TASKFILE instead of REQ_DRIVE_CMD. This is
preparation for removal of REQ_DRIVE_CMD.

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

ide-io.c | 4 ++--
ide-taskfile.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
Index: linux-ide/drivers/ide/ide-io.c
===================================================================
--- linux-ide.orig/drivers/ide/ide-io.c 2005-02-10 17:31:48.835669731 +0900
+++ linux-ide/drivers/ide/ide-io.c 2005-02-10 17:38:00.436024471 +0900
@@ -64,7 +64,7 @@ static void ide_fill_flush_cmd(ide_drive
*/
memset(buf, 0, sizeof(rq->cmd));

- rq->flags |= REQ_DRIVE_TASK | REQ_STARTED;
+ rq->flags = REQ_DRIVE_TASK | REQ_STARTED;
rq->buffer = buf;
rq->buffer[0] = WIN_FLUSH_CACHE;

@@ -1738,7 +1738,7 @@ irqreturn_t ide_intr (int irq, void *dev
void ide_init_drive_cmd (struct request *rq)
{
memset(rq, 0, sizeof(*rq));
- rq->flags = REQ_DRIVE_CMD;
+ rq->flags = REQ_DRIVE_TASKFILE;
rq->ref_count = 1;
}

Index: linux-ide/drivers/ide/ide-taskfile.c
===================================================================
--- linux-ide.orig/drivers/ide/ide-taskfile.c 2005-02-10 17:38:00.042090547 +0900
+++ linux-ide/drivers/ide/ide-taskfile.c 2005-02-10 17:38:00.437024304 +0900
@@ -668,6 +668,7 @@ int ide_wait_cmd (ide_drive_t *drive, u8
buf = buffer;
memset(buf, 0, 4 + SECTOR_WORDS * 4 * sectors);
ide_init_drive_cmd(&rq);
+ rq.flags = REQ_DRIVE_CMD;
rq.buffer = buf;
*buf++ = cmd;
*buf++ = nsect;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 14:10    [from the cache]
©2003-2011 Jasper Spaans