diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:37 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:37 -0400 |
commit | 22aa4b32a19b1f231d4ce7e9af6354b577a22a35 (patch) | |
tree | 3e773e7102e4ea6bb6b4c00edce442c4e8f37edb /drivers/ide/ide-acpi.c | |
parent | e6830a86c260d73c6f370aa7ed17ee6c71e5ee05 (diff) |
ide: remove ide_task_t typedef
While at it:
- rename struct ide_task_s to struct ide_cmd
- remove stale comments from idedisk_{read_native,set}_max_address()
- drop unused 'cmd' argument from ide_{cmd,task}_ioctl()
- drop unused 'task' argument from tx4939ide_tf_load_fixup()
- rename ide_complete_task() to ide_complete_cmd()
- use consistent naming for struct ide_cmd variables
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-acpi.c')
-rw-r--r-- | drivers/ide/ide-acpi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index 5b704f1ea90c..12f436951bff 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c | |||
@@ -304,7 +304,7 @@ static int do_drive_set_taskfiles(ide_drive_t *drive, | |||
304 | /* send all taskfile registers (0x1f1-0x1f7) *in*that*order* */ | 304 | /* send all taskfile registers (0x1f1-0x1f7) *in*that*order* */ |
305 | for (ix = 0; ix < gtf_count; ix++) { | 305 | for (ix = 0; ix < gtf_count; ix++) { |
306 | u8 *gtf = (u8 *)(gtf_address + ix * REGS_PER_GTF); | 306 | u8 *gtf = (u8 *)(gtf_address + ix * REGS_PER_GTF); |
307 | ide_task_t task; | 307 | struct ide_cmd cmd; |
308 | 308 | ||
309 | DEBPRINT("(0x1f1-1f7): " | 309 | DEBPRINT("(0x1f1-1f7): " |
310 | "hex: %02x %02x %02x %02x %02x %02x %02x\n", | 310 | "hex: %02x %02x %02x %02x %02x %02x %02x\n", |
@@ -317,11 +317,11 @@ static int do_drive_set_taskfiles(ide_drive_t *drive, | |||
317 | } | 317 | } |
318 | 318 | ||
319 | /* convert GTF to taskfile */ | 319 | /* convert GTF to taskfile */ |
320 | memset(&task, 0, sizeof(ide_task_t)); | 320 | memset(&cmd, 0, sizeof(cmd)); |
321 | memcpy(&task.tf_array[7], gtf, REGS_PER_GTF); | 321 | memcpy(&cmd.tf_array[7], gtf, REGS_PER_GTF); |
322 | task.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; | 322 | cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; |
323 | 323 | ||
324 | err = ide_no_data_taskfile(drive, &task); | 324 | err = ide_no_data_taskfile(drive, &cmd); |
325 | if (err) { | 325 | if (err) { |
326 | printk(KERN_ERR "%s: ide_no_data_taskfile failed: %u\n", | 326 | printk(KERN_ERR "%s: ide_no_data_taskfile failed: %u\n", |
327 | __func__, err); | 327 | __func__, err); |