ide: convert "empty" REQ_TYPE_ATA_CMD requests to use REQ_TYPE_ATA_TASKFILE

Based on the previous work by Tejun Heo.

There should be no functionality changes caused by this patch.

Cc: Tejun Heo <htejun@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

3 files changed, 5 insertions, 3 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 027bf4397592..717e114ced52 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -620,8 +620,10 @@ static int set_multcount(ide_drive_t *drive, int arg)
 
         if (drive->special.b.set_multmode)
                 return -EBUSY;
+
         ide_init_drive_cmd (&rq);
-        rq.cmd_type = REQ_TYPE_ATA_CMD;
+        rq.cmd_type = REQ_TYPE_ATA_TASKFILE;
+
         drive->mult_req = arg;
         drive->special.b.set_multmode = 1;
         (void) ide_do_drive_cmd (drive, &rq, ide_wait);
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index b8c7e8134d88..94046509f004 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -781,7 +781,7 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
                 struct request rq;
 
                 ide_init_drive_cmd(&rq);
-                rq.cmd_type = REQ_TYPE_ATA_CMD;
+                rq.cmd_type = REQ_TYPE_ATA_TASKFILE;
 
                 return ide_do_drive_cmd(drive, &rq, ide_wait);
         }
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 446b12850155..97894abd9ebc 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -880,7 +880,7 @@ int set_pio_mode(ide_drive_t *drive, int arg)
                 return -EBUSY;
 
         ide_init_drive_cmd(&rq);
-        rq.cmd_type = REQ_TYPE_ATA_CMD;
+        rq.cmd_type = REQ_TYPE_ATA_TASKFILE;
 
         drive->tune_req = (u8) arg;
         drive->special.b.set_tune = 1;