diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:39 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:39 -0400 |
commit | 0dfb991c6943c810175376b58d1c29cfe532541b (patch) | |
tree | c7b82d2ea9159e94c40f8df1a178dab4d2590ed3 /drivers/ide/ide-disk_proc.c | |
parent | 04d09b0e62f2180a7e3fa8578ed778eca0c454fd (diff) |
ide: use ata_tf_protocols enums
* Add IDE_TFLAG_MULTI_PIO taskfile flag and set it for commands
using multi-PIO protocol.
* Use ata_tf_protocols enums instead of TASKFILE_* defines to
denote command's protocol and then rename ->data_phase field
to ->protocol.
* Remove no longer needed <linux/hdreg.h> includes.
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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-disk_proc.c b/drivers/ide/ide-disk_proc.c index afe4f47e9e19..eaea3bef2073 100644 --- a/drivers/ide/ide-disk_proc.c +++ b/drivers/ide/ide-disk_proc.c | |||
@@ -1,6 +1,5 @@ | |||
1 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
2 | #include <linux/ide.h> | 2 | #include <linux/ide.h> |
3 | #include <linux/hdreg.h> | ||
4 | 3 | ||
5 | #include "ide-disk.h" | 4 | #include "ide-disk.h" |
6 | 5 | ||
@@ -30,8 +29,8 @@ static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd) | |||
30 | tf->lbam = ATA_SMART_LBAM_PASS; | 29 | tf->lbam = ATA_SMART_LBAM_PASS; |
31 | tf->lbah = ATA_SMART_LBAH_PASS; | 30 | tf->lbah = ATA_SMART_LBAH_PASS; |
32 | tf->command = ATA_CMD_SMART; | 31 | tf->command = ATA_CMD_SMART; |
33 | cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; | 32 | cmd.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE; |
34 | cmd.data_phase = TASKFILE_IN; | 33 | cmd.protocol = ATA_PROT_PIO; |
35 | 34 | ||
36 | return ide_raw_taskfile(drive, &cmd, buf, 1); | 35 | return ide_raw_taskfile(drive, &cmd, buf, 1); |
37 | } | 36 | } |