diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:07 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-25 16:17:07 -0500 |
commit | 9a3c49be5c5f7388eefb712be9a383904140532e (patch) | |
tree | 5dc16604e155dcc6c14e65dc3cfce8605f2c8f82 /drivers/ide/ide-acpi.c | |
parent | 9e42237f26cf517a3f682505f03a3a8d89b3b35d (diff) |
ide: add ide_no_data_taskfile() helper
* Add ide_no_data_taskfile() helper and convert ide_raw_taskfile() w/ NO DATA
protocol users to use it instead.
* Set ->data_phase explicitly in ide_no_data_taskfile()
(TASKFILE_NO_DATA is defined as 0x0000).
* Unexport task_no_data_intr().
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-acpi.c')
-rw-r--r-- | drivers/ide/ide-acpi.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index 747c51889f7d..f0a6a3d6d2d3 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c | |||
@@ -383,9 +383,6 @@ static int taskfile_load_raw(ide_drive_t *drive, | |||
383 | gtf->tfa[3], gtf->tfa[4], gtf->tfa[5], gtf->tfa[6]); | 383 | gtf->tfa[3], gtf->tfa[4], gtf->tfa[5], gtf->tfa[6]); |
384 | 384 | ||
385 | memset(&args, 0, sizeof(ide_task_t)); | 385 | memset(&args, 0, sizeof(ide_task_t)); |
386 | args.command_type = IDE_DRIVE_TASK_NO_DATA; | ||
387 | args.data_phase = TASKFILE_NO_DATA; | ||
388 | args.handler = &task_no_data_intr; | ||
389 | 386 | ||
390 | /* convert gtf to IDE Taskfile */ | 387 | /* convert gtf to IDE Taskfile */ |
391 | memcpy(&args.tf_array[7], >f->tfa, 7); | 388 | memcpy(&args.tf_array[7], >f->tfa, 7); |
@@ -395,9 +392,9 @@ static int taskfile_load_raw(ide_drive_t *drive, | |||
395 | return err; | 392 | return err; |
396 | } | 393 | } |
397 | 394 | ||
398 | err = ide_raw_taskfile(drive, &args, NULL); | 395 | err = ide_no_data_taskfile(drive, &args); |
399 | if (err) | 396 | if (err) |
400 | printk(KERN_ERR "%s: ide_raw_taskfile failed: %u\n", | 397 | printk(KERN_ERR "%s: ide_no_data_taskfile failed: %u\n", |
401 | __FUNCTION__, err); | 398 | __FUNCTION__, err); |
402 | 399 | ||
403 | return err; | 400 | return err; |