aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-disk.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:16 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:16 -0500
commit1192e528e064ebb9a578219731d2b0f78ca3c1ec (patch)
treed220412f152337618cbb19dac35c98016258e9b8 /drivers/ide/ide-disk.c
parent10d90157c83d4b6743c9063c36f9e7f27aa254b6 (diff)
ide: use ->data_phase to set ->handler in do_rw_taskfile()
* Use ->data_phase to set ->handler in do_rw_taskfile() instead of setting ->handler in callers of ide_raw_taskfile()/do_rw_taskfile(). * Unexport task_no_data_intr() and make it static. There should be no functionality changes caused by this patch. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-disk.c')
-rw-r--r--drivers/ide/ide-disk.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 424207e67f9..a063957e9ad 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -518,7 +518,6 @@ static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd)
518 tf->command = WIN_SMART; 518 tf->command = WIN_SMART;
519 args.tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE; 519 args.tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE;
520 args.data_phase = TASKFILE_IN; 520 args.data_phase = TASKFILE_IN;
521 args.handler = task_in_intr;
522 (void) smart_enable(drive); 521 (void) smart_enable(drive);
523 return ide_raw_taskfile(drive, &args, buf, 1); 522 return ide_raw_taskfile(drive, &args, buf, 1);
524} 523}
@@ -608,7 +607,6 @@ static void idedisk_prepare_flush(struct request_queue *q, struct request *rq)
608 task.tf.command = WIN_FLUSH_CACHE; 607 task.tf.command = WIN_FLUSH_CACHE;
609 task.tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE; 608 task.tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE;
610 task.data_phase = TASKFILE_NO_DATA; 609 task.data_phase = TASKFILE_NO_DATA;
611 task.handler = task_no_data_intr;
612 610
613 rq->cmd_type = REQ_TYPE_ATA_TASKFILE; 611 rq->cmd_type = REQ_TYPE_ATA_TASKFILE;
614 rq->cmd_flags |= REQ_SOFTBARRIER; 612 rq->cmd_flags |= REQ_SOFTBARRIER;