aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:42 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-27 07:46:42 -0400
commitd364c7f50b3bb6dc77259974038567b821e2cf0a (patch)
tree8a7a01a17656fb758a03ed0f1430371c300b07c1
parente7fedc3ca0b8fcd3350a40c42a7100a9539e6c4a (diff)
ide: use ide_complete_cmd() for REQ_UNPARK_HEADS
* Fixup ->tf_flags in ide_do_park_unpark() to match their current use. * Use ide_complete_cmd() for REQ_UNPARK_HEADS. While at it: * No need to read Error register for PM requests in task_no_data_intr(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide-park.c4
-rw-r--r--drivers/ide/ide-taskfile.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c
index c575900d5596..9490b446519f 100644
--- a/drivers/ide/ide-park.c
+++ b/drivers/ide/ide-park.c
@@ -74,11 +74,11 @@ ide_startstop_t ide_do_park_unpark(ide_drive_t *drive, struct request *rq)
74 tf->lbal = 0x4c; 74 tf->lbal = 0x4c;
75 tf->lbam = 0x4e; 75 tf->lbam = 0x4e;
76 tf->lbah = 0x55; 76 tf->lbah = 0x55;
77 cmd.tf_flags |= IDE_TFLAG_CUSTOM_HANDLER; 77 cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
78 } else /* cmd == REQ_UNPARK_HEADS */ 78 } else /* cmd == REQ_UNPARK_HEADS */
79 tf->command = ATA_CMD_CHK_POWER; 79 tf->command = ATA_CMD_CHK_POWER;
80 80
81 cmd.tf_flags |= IDE_TFLAG_TF | IDE_TFLAG_DEVICE; 81 cmd.tf_flags |= IDE_TFLAG_CUSTOM_HANDLER;
82 cmd.protocol = ATA_PROT_NODATA; 82 cmd.protocol = ATA_PROT_NODATA;
83 83
84 cmd.rq = rq; 84 cmd.rq = rq;
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 4883aa4052ac..bbf7740d58a5 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -149,16 +149,16 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
149 if (custom && tf->command == ATA_CMD_SET_MULTI) 149 if (custom && tf->command == ATA_CMD_SET_MULTI)
150 drive->mult_count = drive->mult_req; 150 drive->mult_count = drive->mult_req;
151 151
152 if (custom == 0 || tf->command == ATA_CMD_IDLEIMMEDIATE) { 152 if (custom == 0 || tf->command == ATA_CMD_IDLEIMMEDIATE ||
153 tf->command == ATA_CMD_CHK_POWER) {
153 struct request *rq = hwif->rq; 154 struct request *rq = hwif->rq;
154 u8 err = ide_read_error(drive);
155 155
156 if (blk_pm_request(rq)) 156 if (blk_pm_request(rq))
157 ide_complete_pm_rq(drive, rq); 157 ide_complete_pm_rq(drive, rq);
158 else { 158 else {
159 if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE || 159 u8 err = ide_read_error(drive);
160 tf->command == ATA_CMD_IDLEIMMEDIATE) 160
161 ide_complete_cmd(drive, cmd, stat, err); 161 ide_complete_cmd(drive, cmd, stat, err);
162 ide_complete_rq(drive, err); 162 ide_complete_rq(drive, err);
163 } 163 }
164 } 164 }