diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 2 | ||||
| -rw-r--r-- | include/linux/hdreg.h | 4 | ||||
| -rw-r--r-- | include/linux/ide.h | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 407b176d7dad..a3e1c02d6d63 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -81,7 +81,6 @@ enum rq_flag_bits { /* * for ATA/ATAPI devices */ - __REQ_DRIVE_CMD, __REQ_DRIVE_ACB, __REQ_PC, /* packet command (special) */ @@ -101,7 +100,6 @@ enum rq_flag_bits { #define REQ_STARTED (1 << __REQ_STARTED) #define REQ_DONTPREP (1 << __REQ_DONTPREP) #define REQ_QUEUED (1 << __REQ_QUEUED) -#define REQ_DRIVE_CMD (1 << __REQ_DRIVE_CMD) #define REQ_DRIVE_ACB (1 << __REQ_DRIVE_ACB) #define REQ_PC (1 << __REQ_PC) #define REQ_BLOCK_PC (1 << __REQ_BLOCK_PC) diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h index a9aa625ffe1e..6f1fd4aae99a 100644 --- a/include/linux/hdreg.h +++ b/include/linux/hdreg.h @@ -74,16 +74,12 @@ #define IDE_DRIVE_TASK_RAW_WRITE 4 struct hd_drive_task_hdr { - u8 data; u8 feature; u8 sector_count; u8 sector_number; u8 low_cylinder; u8 high_cylinder; u8 device_head; - - /* FXIME: Consider moving this out from here. */ - u8 command; } __attribute__((packed)); /* diff --git a/include/linux/ide.h b/include/linux/ide.h index 7e22036b21a8..9c289abd3ccc 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -253,11 +253,11 @@ typedef union { unsigned all : 8; /* all of the bits together */ struct { #if defined(__LITTLE_ENDIAN_BITFIELD) - unsigned XXX_head : 4; /* always zeros here */ + unsigned head : 4; /* always zeros here */ unsigned unit : 1; /* drive select number: 0/1 */ - unsigned XXX_bit5 : 1; /* always 1 */ + unsigned bit5 : 1; /* always 1 */ unsigned lba : 1; /* using LBA instead of CHS */ - unsigned XXX_bit7 : 1; /* always 1 */ + unsigned bit7 : 1; /* always 1 */ #elif defined(__BIG_ENDIAN_BITFIELD) unsigned bit7 : 1; unsigned lba : 1; @@ -666,11 +666,12 @@ extern int ide_do_drive_cmd(struct ata_device *, struct request *, ide_action_t) /* * Clean up after success/failure of an explicit drive cmd. */ -extern void ide_end_drive_cmd(struct ata_device *, struct request *, u8); +extern void ide_end_drive_cmd(struct ata_device *, struct request *); struct ata_taskfile { struct hd_drive_task_hdr taskfile; struct hd_drive_task_hdr hobfile; + u8 cmd; /* actual ATA command */ int command_type; ide_startstop_t (*prehandler)(struct ata_device *, struct request *); ide_startstop_t (*handler)(struct ata_device *, struct request *); |