aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:12 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 14:13:12 -0500
commit852738f39258deafb3d89c187cb1a4050820d555 (patch)
tree0b6fe1d16d9d7413d7593454a4f312ad7c709670 /drivers/ide
parent145b75e9aedbe36c55e45da8564dcd0814bdd89e (diff)
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>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-disk.c4
-rw-r--r--drivers/ide/ide-taskfile.c2
-rw-r--r--drivers/ide/ide.c2
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)
620 620
621 if (drive->special.b.set_multmode) 621 if (drive->special.b.set_multmode)
622 return -EBUSY; 622 return -EBUSY;
623
623 ide_init_drive_cmd (&rq); 624 ide_init_drive_cmd (&rq);
624 rq.cmd_type = REQ_TYPE_ATA_CMD; 625 rq.cmd_type = REQ_TYPE_ATA_TASKFILE;
626
625 drive->mult_req = arg; 627 drive->mult_req = arg;
626 drive->special.b.set_multmode = 1; 628 drive->special.b.set_multmode = 1;
627 (void) ide_do_drive_cmd (drive, &rq, ide_wait); 629 (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)
781 struct request rq; 781 struct request rq;
782 782
783 ide_init_drive_cmd(&rq); 783 ide_init_drive_cmd(&rq);
784 rq.cmd_type = REQ_TYPE_ATA_CMD; 784 rq.cmd_type = REQ_TYPE_ATA_TASKFILE;
785 785
786 return ide_do_drive_cmd(drive, &rq, ide_wait); 786 return ide_do_drive_cmd(drive, &rq, ide_wait);
787 } 787 }
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)
880 return -EBUSY; 880 return -EBUSY;
881 881
882 ide_init_drive_cmd(&rq); 882 ide_init_drive_cmd(&rq);
883 rq.cmd_type = REQ_TYPE_ATA_CMD; 883 rq.cmd_type = REQ_TYPE_ATA_TASKFILE;
884 884
885 drive->tune_req = (u8) arg; 885 drive->tune_req = (u8) arg;
886 drive->special.b.set_tune = 1; 886 drive->special.b.set_tune = 1;