Skip to content

Commit

Permalink
ide: factor out completion of taskfile from ide_end_drive_cmd()
Browse files Browse the repository at this point in the history
Factor out completion of taskfile from ide_end_drive_cmd()
to ide_complete_task().

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Mar 27, 2009
1 parent 3616b65 commit e120237
Showing 1 changed file with 16 additions and 11 deletions.
27 changes: 16 additions & 11 deletions drivers/ide/ide-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,20 @@ int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq,
}
EXPORT_SYMBOL_GPL(ide_end_dequeued_request);

static void ide_complete_task(ide_drive_t *drive, ide_task_t *task,
u8 stat, u8 err)
{
struct ide_taskfile *tf = &task->tf;

tf->error = err;
tf->status = stat;

drive->hwif->tp_ops->tf_read(drive, task);

if (task->tf_flags & IDE_TFLAG_DYN)
kfree(task);
}

/**
* ide_end_drive_cmd - end an explicit drive command
* @drive: command
Expand All @@ -166,17 +180,8 @@ void ide_end_drive_cmd (ide_drive_t *drive, u8 stat, u8 err)
if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE) {
ide_task_t *task = (ide_task_t *)rq->special;

if (task) {
struct ide_taskfile *tf = &task->tf;

tf->error = err;
tf->status = stat;

drive->hwif->tp_ops->tf_read(drive, task);

if (task->tf_flags & IDE_TFLAG_DYN)
kfree(task);
}
if (task)
ide_complete_task(drive, task, stat, err);
} else if (blk_pm_request(rq)) {
ide_complete_pm_rq(drive, rq);
return;
Expand Down

0 comments on commit e120237

Please sign in to comment.