aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-io.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:14 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-25 16:17:14 -0500
commitac026ff254b32915bb14ba97a23b4019d137f181 (patch)
treeab5687be210c4016d16fae7a8e51bfc1c41c4c42 /drivers/ide/ide-io.c
parent7299a3918442dc9a5abb71b9f65b1dd17637c8c0 (diff)
ide: remove 'command_type' field from ide_task_t
* Add 'data_buf' and 'nsect' variables in ide_taskfile_ioctl() to cache data buffer pointer and number of sectors to transfer (this allows us to have only one ide_diag_taskfile() call). * Add IDE_TFLAG_WRITE taskfile flag and use it to check whether the REQ_RW request flag should be set. * Move ->command_type handling from ide_diag_taskfile() to ide_taskfile_ioctl() and use ->req_cmd instead of ->command_type. * Add 'nsect' parameter to ide_raw_taskfile(). * Merge ide_diag_taskfile() into ide_raw_taskfile(). * Initialize ->data_phase explicitly in idedisk_prepare_flush(), ide_start_power_step() and ide_disk_special(). * Remove no longer needed 'command_type' field from ide_task_t. * Add #ifndef/#endif __KERNEL__ to <linux/hdreg.h> around no longer used by kernel IDE_DRIVE_TASK_* and TASKFILE_* defines. 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-io.c')
-rw-r--r--drivers/ide/ide-io.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 6ee7458d34ed..f4f7e3db10ac 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -232,9 +232,9 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
232 return ide_stopped; 232 return ide_stopped;
233 233
234out_do_tf: 234out_do_tf:
235 args->tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE; 235 args->tf_flags = IDE_TFLAG_OUT_TF | IDE_TFLAG_OUT_DEVICE;
236 args->command_type = IDE_DRIVE_TASK_NO_DATA; 236 args->data_phase = TASKFILE_NO_DATA;
237 args->handler = task_no_data_intr; 237 args->handler = task_no_data_intr;
238 return do_rw_taskfile(drive, args); 238 return do_rw_taskfile(drive, args);
239} 239}
240 240
@@ -672,7 +672,7 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive)
672 ide_task_t args; 672 ide_task_t args;
673 673
674 memset(&args, 0, sizeof(ide_task_t)); 674 memset(&args, 0, sizeof(ide_task_t));
675 args.command_type = IDE_DRIVE_TASK_NO_DATA; 675 args.data_phase = TASKFILE_NO_DATA;
676 676
677 if (s->b.set_geometry) { 677 if (s->b.set_geometry) {
678 s->b.set_geometry = 0; 678 s->b.set_geometry = 0;