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-disk_proc.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-disk_proc.c')
-rw-r--r-- | drivers/ide/ide-disk_proc.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/ide/ide-disk_proc.c b/drivers/ide/ide-disk_proc.c index 5766c1f62ad2..afe4f47e9e19 100644 --- a/drivers/ide/ide-disk_proc.c +++ b/drivers/ide/ide-disk_proc.c | |||
@@ -6,33 +6,34 @@ | |||
6 | 6 | ||
7 | static int smart_enable(ide_drive_t *drive) | 7 | static int smart_enable(ide_drive_t *drive) |
8 | { | 8 | { |
9 | ide_task_t args; | 9 | struct ide_cmd cmd; |
10 | struct ide_taskfile *tf = &args.tf; | 10 | struct ide_taskfile *tf = &cmd.tf; |
11 | 11 | ||
12 | memset(&args, 0, sizeof(ide_task_t)); | 12 | memset(&cmd, 0, sizeof(cmd)); |
13 | tf->feature = ATA_SMART_ENABLE; | 13 | tf->feature = ATA_SMART_ENABLE; |
14 | tf->lbam = ATA_SMART_LBAM_PASS; | 14 | tf->lbam = ATA_SMART_LBAM_PASS; |
15 | tf->lbah = ATA_SMART_LBAH_PASS; | 15 | tf->lbah = ATA_SMART_LBAH_PASS; |
16 | tf->command = ATA_CMD_SMART; | 16 | tf->command = ATA_CMD_SMART; |
17 | args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; | 17 | cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; |
18 | return ide_no_data_taskfile(drive, &args); | 18 | |
19 | return ide_no_data_taskfile(drive, &cmd); | ||
19 | } | 20 | } |
20 | 21 | ||
21 | static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd) | 22 | static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd) |
22 | { | 23 | { |
23 | ide_task_t args; | 24 | struct ide_cmd cmd; |
24 | struct ide_taskfile *tf = &args.tf; | 25 | struct ide_taskfile *tf = &cmd.tf; |
25 | 26 | ||
26 | memset(&args, 0, sizeof(ide_task_t)); | 27 | memset(&cmd, 0, sizeof(cmd)); |
27 | tf->feature = sub_cmd; | 28 | tf->feature = sub_cmd; |
28 | tf->nsect = 0x01; | 29 | tf->nsect = 0x01; |
29 | tf->lbam = ATA_SMART_LBAM_PASS; | 30 | tf->lbam = ATA_SMART_LBAM_PASS; |
30 | tf->lbah = ATA_SMART_LBAH_PASS; | 31 | tf->lbah = ATA_SMART_LBAH_PASS; |
31 | tf->command = ATA_CMD_SMART; | 32 | tf->command = ATA_CMD_SMART; |
32 | args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; | 33 | cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; |
33 | args.data_phase = TASKFILE_IN; | 34 | cmd.data_phase = TASKFILE_IN; |
34 | 35 | ||
35 | return ide_raw_taskfile(drive, &args, buf, 1); | 36 | return ide_raw_taskfile(drive, &cmd, buf, 1); |
36 | } | 37 | } |
37 | 38 | ||
38 | static int proc_idedisk_read_cache | 39 | static int proc_idedisk_read_cache |