diff options
| author | Bartlomiej Zolnierkiewicz | 2009-03-24 23:22:44 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2009-03-24 23:22:44 +0100 |
| commit | 1866082339597930c5b77aad8de34ab4fbb5724f (patch) | |
| tree | 364832322ceae98f41233fd095558b1700cf3634 /drivers/ide/ide-atapi.c | |
| parent | ide: move ide_dma_timeout_retry() to ide-dma.c (diff) | |
| download | kernel-qcow2-linux-1866082339597930c5b77aad8de34ab4fbb5724f.tar.gz kernel-qcow2-linux-1866082339597930c5b77aad8de34ab4fbb5724f.tar.xz kernel-qcow2-linux-1866082339597930c5b77aad8de34ab4fbb5724f.zip | |
ide: remove ide_do_drive_cmd()
* Use elv_add_request() instead of __elv_add_request() in ide_do_drive_cmd().
* ide_do_drive_cmd() is used only in ide-{atapi,cd}.c so inline it there.
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-atapi.c')
| -rw-r--r-- | drivers/ide/ide-atapi.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index 09ae30f46070..3044c51c06a5 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c @@ -149,7 +149,10 @@ static void ide_queue_pc_head(ide_drive_t *drive, struct gendisk *disk, memcpy(rq->cmd, pc->c, 12); if (drive->media == ide_tape) rq->cmd[13] = REQ_IDETAPE_PC1; - ide_do_drive_cmd(drive, rq); + + drive->hwif->rq = NULL; + + elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 0); } /* |