Commit 451181f1 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] switch ide taskfile ioctls to ide_execute_command

parent 1b0f4ce6
...@@ -177,8 +177,7 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task) ...@@ -177,8 +177,7 @@ ide_startstop_t do_rw_taskfile (ide_drive_t *drive, ide_task_t *task)
hwif->OUTB((taskfile->device_head & HIHI) | drive->select.all, IDE_SELECT_REG); hwif->OUTB((taskfile->device_head & HIHI) | drive->select.all, IDE_SELECT_REG);
if (task->handler != NULL) { if (task->handler != NULL) {
ide_set_handler(drive, task->handler, WAIT_WORSTCASE, NULL); ide_execute_command(drive, taskfile->command, task->handler, WAIT_WORSTCASE, NULL);
hwif->OUTB(taskfile->command, IDE_COMMAND_REG);
if (task->prehandler != NULL) if (task->prehandler != NULL)
return task->prehandler(drive, task->rq); return task->prehandler(drive, task->rq);
return ide_started; return ide_started;
...@@ -1880,9 +1879,8 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task) ...@@ -1880,9 +1879,8 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
if (task->handler == NULL) if (task->handler == NULL)
return ide_stopped; return ide_stopped;
ide_set_handler(drive, task->handler, WAIT_WORSTCASE, NULL);
/* Issue the command */ /* Issue the command */
hwif->OUTB(taskfile->command, IDE_COMMAND_REG); ide_execute_command(drive, taskfile->command, task->handler, WAIT_WORSTCASE, NULL);
if (task->prehandler != NULL) if (task->prehandler != NULL)
return task->prehandler(drive, HWGROUP(drive)->rq); return task->prehandler(drive, HWGROUP(drive)->rq);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment