diff options
Diffstat (limited to 'include/linux/ide.h')
-rw-r--r-- | include/linux/ide.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index ae93f89e4448..7890768d03ed 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -889,6 +889,7 @@ enum { | |||
889 | IDE_TFLAG_IN_HOB = IDE_TFLAG_IN_HOB_FEATURE | | 889 | IDE_TFLAG_IN_HOB = IDE_TFLAG_IN_HOB_FEATURE | |
890 | IDE_TFLAG_IN_HOB_NSECT | | 890 | IDE_TFLAG_IN_HOB_NSECT | |
891 | IDE_TFLAG_IN_HOB_LBA, | 891 | IDE_TFLAG_IN_HOB_LBA, |
892 | IDE_TFLAG_IN_FEATURE = (1 << 1), | ||
892 | IDE_TFLAG_IN_NSECT = (1 << 25), | 893 | IDE_TFLAG_IN_NSECT = (1 << 25), |
893 | IDE_TFLAG_IN_LBAL = (1 << 26), | 894 | IDE_TFLAG_IN_LBAL = (1 << 26), |
894 | IDE_TFLAG_IN_LBAM = (1 << 27), | 895 | IDE_TFLAG_IN_LBAM = (1 << 27), |
@@ -956,6 +957,8 @@ void ide_tf_dump(const char *, struct ide_taskfile *); | |||
956 | extern void SELECT_DRIVE(ide_drive_t *); | 957 | extern void SELECT_DRIVE(ide_drive_t *); |
957 | void SELECT_MASK(ide_drive_t *, int); | 958 | void SELECT_MASK(ide_drive_t *, int); |
958 | 959 | ||
960 | u8 ide_read_error(ide_drive_t *); | ||
961 | |||
959 | extern int drive_is_ready(ide_drive_t *); | 962 | extern int drive_is_ready(ide_drive_t *); |
960 | 963 | ||
961 | void ide_pktcmd_tf_load(ide_drive_t *, u32, u16, u8); | 964 | void ide_pktcmd_tf_load(ide_drive_t *, u32, u16, u8); |
@@ -1357,11 +1360,4 @@ static inline ide_drive_t *ide_get_paired_drive(ide_drive_t *drive) | |||
1357 | 1360 | ||
1358 | return &hwif->drives[(drive->dn ^ 1) & 1]; | 1361 | return &hwif->drives[(drive->dn ^ 1) & 1]; |
1359 | } | 1362 | } |
1360 | |||
1361 | static inline u8 ide_read_error(ide_drive_t *drive) | ||
1362 | { | ||
1363 | ide_hwif_t *hwif = drive->hwif; | ||
1364 | |||
1365 | return hwif->INB(hwif->io_ports.error_addr); | ||
1366 | } | ||
1367 | #endif /* _IDE_H */ | 1363 | #endif /* _IDE_H */ |