ide: initialize rq->cmd_type in ide_init_drive_cmd() callers

* Initialize rq->cmd_type in ide_wait_cmd(), ide_cmd_ioctl() and
  set_pio_mode() (other callers were aleady over-riding rq->cmd_type).

* Remove no longer needed rq->cmd_type setup from ide_init_drive_cmd().

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

3 files changed, 7 insertions, 1 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 513a5685db2f..8c9890414eb2 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1672,7 +1672,6 @@ irqreturn_t ide_intr (int irq, void *dev_id)
 void ide_init_drive_cmd (struct request *rq)
 {
         memset(rq, 0, sizeof(*rq));
-        rq->cmd_type = REQ_TYPE_ATA_CMD;
         rq->ref_count = 1;
 }
 
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index b559bece6e73..b8c7e8134d88 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -759,6 +759,7 @@ int ide_wait_cmd (ide_drive_t *drive, u8 cmd, u8 nsect, u8 feature, u8 sectors,
                 buf = buffer;
         memset(buf, 0, 4 + SECTOR_WORDS * 4 * sectors);
         ide_init_drive_cmd(&rq);
+        rq.cmd_type = REQ_TYPE_ATA_CMD;
         rq.buffer = buf;
         *buf++ = cmd;
         *buf++ = nsect;
@@ -778,7 +779,10 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 
         if (NULL == (void *) arg) {
                 struct request rq;
+
                 ide_init_drive_cmd(&rq);
+                rq.cmd_type = REQ_TYPE_ATA_CMD;
+
                 return ide_do_drive_cmd(drive, &rq, ide_wait);
         }
 
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 52115ef1f01a..446b12850155 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -878,7 +878,10 @@ int set_pio_mode(ide_drive_t *drive, int arg)
 
         if (drive->special.b.set_tune)
                 return -EBUSY;
+
         ide_init_drive_cmd(&rq);
+        rq.cmd_type = REQ_TYPE_ATA_CMD;
+
         drive->tune_req = (u8) arg;
         drive->special.b.set_tune = 1;
         (void) ide_do_drive_cmd(drive, &rq, ide_wait);