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-park.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-park.c')
-rw-r--r-- | drivers/ide/ide-park.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c index 63c77f99a726..c575900d5596 100644 --- a/drivers/ide/ide-park.c +++ b/drivers/ide/ide-park.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 | #include <linux/jiffies.h> | 3 | #include <linux/jiffies.h> |
5 | #include <linux/blkdev.h> | 4 | #include <linux/blkdev.h> |
6 | 5 | ||
@@ -80,8 +79,9 @@ ide_startstop_t ide_do_park_unpark(ide_drive_t *drive, struct request *rq) | |||
80 | tf->command = ATA_CMD_CHK_POWER; | 79 | tf->command = ATA_CMD_CHK_POWER; |
81 | 80 | ||
82 | cmd.tf_flags |= IDE_TFLAG_TF | IDE_TFLAG_DEVICE; | 81 | cmd.tf_flags |= IDE_TFLAG_TF | IDE_TFLAG_DEVICE; |
82 | cmd.protocol = ATA_PROT_NODATA; | ||
83 | |||
83 | cmd.rq = rq; | 84 | cmd.rq = rq; |
84 | cmd.data_phase = TASKFILE_NO_DATA; | ||
85 | 85 | ||
86 | return do_rw_taskfile(drive, &cmd); | 86 | return do_rw_taskfile(drive, &cmd); |
87 | } | 87 | } |