lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: use ide_complete_cmd() for REQ_UNPARK_HEADS

Browse Source 
* 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>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2009-03-27 12:46:42 +01:00
parent e7fedc3ca0
commit d364c7f50b
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ide/ide-park.c
View File

@@ -74,11 +74,11 @@ ide_startstop_t ide_do_park_unpark(ide_drive_t *drive, struct request *rq)
tf->lbal = 0x4c; tf->lbal = 0x4c;
tf->lbam = 0x4e; tf->lbam = 0x4e;
tf->lbah = 0x55; tf->lbah = 0x55;
cmd.tf_flags |= IDE_TFLAG_CUSTOM_HANDLER; cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;
} else /* cmd == REQ_UNPARK_HEADS */ } else /* cmd == REQ_UNPARK_HEADS */
tf->command = ATA_CMD_CHK_POWER; tf->command = ATA_CMD_CHK_POWER;
cmd.tf_flags |= IDE_TFLAG_TF | IDE_TFLAG_DEVICE; cmd.tf_flags |= IDE_TFLAG_CUSTOM_HANDLER;
cmd.protocol = ATA_PROT_NODATA; cmd.protocol = ATA_PROT_NODATA;
cmd.rq = rq; cmd.rq = rq;

10
drivers/ide/ide-taskfile.c
View File

@@ -149,16 +149,16 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
if (custom && tf->command == ATA_CMD_SET_MULTI) if (custom && tf->command == ATA_CMD_SET_MULTI)
drive->mult_count = drive->mult_req; drive->mult_count = drive->mult_req;
if (custom == 0 || tf->command == ATA_CMD_IDLEIMMEDIATE) { if (custom == 0 || tf->command == ATA_CMD_IDLEIMMEDIATE ||
tf->command == ATA_CMD_CHK_POWER) {
struct request *rq = hwif->rq; struct request *rq = hwif->rq;
u8 err = ide_read_error(drive);
if (blk_pm_request(rq)) if (blk_pm_request(rq))
ide_complete_pm_rq(drive, rq); ide_complete_pm_rq(drive, rq);
else { else {
if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE || u8 err = ide_read_error(drive);
tf->command == ATA_CMD_IDLEIMMEDIATE)
ide_complete_cmd(drive, cmd, stat, err); ide_complete_cmd(drive, cmd, stat, err);
ide_complete_rq(drive, err); ide_complete_rq(drive, err);
} }
} }