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 /include/linux/ide.h | |
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 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 02128e9241d1..f9decc9852e9 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -298,6 +298,7 @@ enum { | |||
298 | /* struct ide_cmd was allocated using kmalloc() */ | 298 | /* struct ide_cmd was allocated using kmalloc() */ |
299 | IDE_TFLAG_DYN = (1 << 27), | 299 | IDE_TFLAG_DYN = (1 << 27), |
300 | IDE_TFLAG_FS = (1 << 28), | 300 | IDE_TFLAG_FS = (1 << 28), |
301 | IDE_TFLAG_MULTI_PIO = (1 << 29), | ||
301 | }; | 302 | }; |
302 | 303 | ||
303 | enum { | 304 | enum { |
@@ -343,7 +344,7 @@ struct ide_cmd { | |||
343 | }; | 344 | }; |
344 | u8 ftf_flags; /* for TASKFILE ioctl */ | 345 | u8 ftf_flags; /* for TASKFILE ioctl */ |
345 | u32 tf_flags; | 346 | u32 tf_flags; |
346 | int data_phase; | 347 | int protocol; |
347 | 348 | ||
348 | int sg_nents; /* number of sg entries */ | 349 | int sg_nents; /* number of sg entries */ |
349 | int orig_sg_nents; | 350 | int orig_sg_nents; |