6 files changed, 15 insertions, 46 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 0fbc2d8d0d53..043129c422fe 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -213,7 +213,7 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense,
         /* NOTE! Save the failed command in "rq->buffer" */
         rq->buffer = (void *) failed_command;
 
-        (void) ide_do_drive_cmd(drive, rq, ide_preempt);
+        ide_do_drive_cmd(drive, rq);
 }
 
 static void cdrom_end_request(ide_drive_t *drive, int uptodate)
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 1852008d9ee4..53209a473937 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -291,7 +291,7 @@ static void idefloppy_queue_pc_head(ide_drive_t *drive, struct ide_atapi_pc *pc,
         rq->cmd_type = REQ_TYPE_SPECIAL;
         rq->cmd_flags |= REQ_PREEMPT;
         rq->rq_disk = floppy->disk;
-        (void) ide_do_drive_cmd(drive, rq, ide_preempt);
+        ide_do_drive_cmd(drive, rq);
 }
 
 static struct ide_atapi_pc *idefloppy_next_pc_storage(ide_drive_t *drive)
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index c28fcdf0ee9e..28057747c1f8 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1520,49 +1520,27 @@ irqreturn_t ide_intr (int irq, void *dev_id)
  *      ide_do_drive_cmd        -       issue IDE special command
  *      @drive: device to issue command
  *      @rq: request to issue
- *      @action: action for processing
  *
  *      This function issues a special IDE device request
  *      onto the request queue.
  *
- *      If action is ide_wait, then the rq is queued at the end of the
- *      request queue, and the function sleeps until it has been processed.
- *      This is for use when invoked from an ioctl handler.
- *
- *      If action is ide_preempt, then the rq is queued at the head of
- *      the request queue, displacing the currently-being-processed
- *      request and this function returns immediately without waiting
- *      for the new rq to be completed.  This is VERY DANGEROUS, and is
- *      intended for careful use by the ATAPI tape/cdrom driver code.
- *
- *      If action is ide_end, then the rq is queued at the end of the
- *      request queue, and the function returns immediately without waiting
- *      for the new rq to be completed. This is again intended for careful
- *      use by the ATAPI tape/cdrom driver code.
+ *      the rq is queued at the head of the request queue, displacing
+ *      the currently-being-processed request and this function
+ *      returns immediately without waiting for the new rq to be
+ *      completed.  This is VERY DANGEROUS, and is intended for
+ *      careful use by the ATAPI tape/cdrom driver code.
  */
- 
-int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t action)
+
+void ide_do_drive_cmd(ide_drive_t *drive, struct request *rq)
 {
         unsigned long flags;
         ide_hwgroup_t *hwgroup = HWGROUP(drive);
-        int where = ELEVATOR_INSERT_BACK;
-
-        rq->errors = 0;
-
-        if (action == ide_preempt)
-                where = ELEVATOR_INSERT_FRONT;
 
         spin_lock_irqsave(&ide_lock, flags);
-        if (action == ide_preempt)
-                hwgroup->rq = NULL;
-        __elv_add_request(drive->queue, rq, where, 1);
+        hwgroup->rq = NULL;
+        __elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 1);
         __generic_unplug_device(drive->queue);
-        /* the queue is stopped so it won't be plugged+unplugged */
-        if (blk_pm_resume_request(rq))
-                do_ide_request(drive->queue);
         spin_unlock_irqrestore(&ide_lock, flags);
-
-        return 0;
 }
 
 EXPORT_SYMBOL(ide_do_drive_cmd);
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index cc7991c7c252..a562df820777 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -691,7 +691,7 @@ static void idetape_queue_pc_head(ide_drive_t *drive, struct ide_atapi_pc *pc,
         rq->cmd_flags |= REQ_PREEMPT;
         rq->buffer = (char *) pc;
         rq->rq_disk = tape->disk;
-        (void) ide_do_drive_cmd(drive, rq, ide_preempt);
+        ide_do_drive_cmd(drive, rq);
 }
 
 /*
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 58e30efe7a74..569ffde6d047 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -245,7 +245,8 @@ static int idescsi_check_condition(ide_drive_t *drive,
                 ide_scsi_hex_dump(pc->c, 6);
         }
         rq->rq_disk = scsi->disk;
-        return ide_do_drive_cmd(drive, rq, ide_preempt);
+        ide_do_drive_cmd(drive, rq);
+        return 0;
 }
 
 static int idescsi_end_request(ide_drive_t *, int, int);
diff --git a/include/linux/ide.h b/include/linux/ide.h
index d8c86f0362c4..04267dc1edf2 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -851,17 +851,7 @@ int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long);
 
 extern ide_startstop_t ide_do_reset (ide_drive_t *);
 
-/*
- * "action" parameter type for ide_do_drive_cmd() below.
- */
-typedef enum {
-        ide_wait,       /* insert rq at end of list, and wait for it */
-        ide_preempt,    /* insert rq in front of current request */
-        ide_head_wait,  /* insert rq in front of current request and wait for it */
-        ide_end         /* insert rq at end of list, but don't wait for it */
-} ide_action_t;
-
-extern int ide_do_drive_cmd(ide_drive_t *, struct request *, ide_action_t);
+extern void ide_do_drive_cmd(ide_drive_t *, struct request *);
 
 extern void ide_end_drive_cmd(ide_drive_t *, u8, u8);