diff options
-rw-r--r-- | include/linux/ide.h | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 9e1cf757b916..17a946b5f552 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -228,9 +228,6 @@ struct hwif_s * ide_find_port(unsigned long); | |||
228 | int ide_register_hw(hw_regs_t *, void (*)(struct hwif_s *), int, | 228 | int ide_register_hw(hw_regs_t *, void (*)(struct hwif_s *), int, |
229 | struct hwif_s **); | 229 | struct hwif_s **); |
230 | 230 | ||
231 | /* | ||
232 | * Set up hw_regs_t structure before calling ide_register_hw (optional) | ||
233 | */ | ||
234 | void ide_setup_ports( hw_regs_t *hw, | 231 | void ide_setup_ports( hw_regs_t *hw, |
235 | unsigned long base, | 232 | unsigned long base, |
236 | int *offsets, | 233 | int *offsets, |
@@ -1031,36 +1028,16 @@ extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs); | |||
1031 | int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq, | 1028 | int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq, |
1032 | int uptodate, int nr_sectors); | 1029 | int uptodate, int nr_sectors); |
1033 | 1030 | ||
1034 | /* | ||
1035 | * This is used on exit from the driver to designate the next irq handler | ||
1036 | * and also to start the safety timer. | ||
1037 | */ | ||
1038 | extern void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry); | 1031 | extern void ide_set_handler (ide_drive_t *drive, ide_handler_t *handler, unsigned int timeout, ide_expiry_t *expiry); |
1039 | 1032 | ||
1040 | /* | ||
1041 | * This is used on exit from the driver to designate the next irq handler | ||
1042 | * and start the safety time safely and atomically from the IRQ handler | ||
1043 | * with respect to the command issue (which it also does) | ||
1044 | */ | ||
1045 | extern void ide_execute_command(ide_drive_t *, task_ioreg_t cmd, ide_handler_t *, unsigned int, ide_expiry_t *); | 1033 | extern void ide_execute_command(ide_drive_t *, task_ioreg_t cmd, ide_handler_t *, unsigned int, ide_expiry_t *); |
1046 | 1034 | ||
1047 | ide_startstop_t __ide_error(ide_drive_t *, struct request *, u8, u8); | 1035 | ide_startstop_t __ide_error(ide_drive_t *, struct request *, u8, u8); |
1048 | 1036 | ||
1049 | /* | ||
1050 | * ide_error() takes action based on the error returned by the controller. | ||
1051 | * The caller should return immediately after invoking this. | ||
1052 | * | ||
1053 | * (drive, msg, status) | ||
1054 | */ | ||
1055 | ide_startstop_t ide_error (ide_drive_t *drive, const char *msg, byte stat); | 1037 | ide_startstop_t ide_error (ide_drive_t *drive, const char *msg, byte stat); |
1056 | 1038 | ||
1057 | ide_startstop_t __ide_abort(ide_drive_t *, struct request *); | 1039 | ide_startstop_t __ide_abort(ide_drive_t *, struct request *); |
1058 | 1040 | ||
1059 | /* | ||
1060 | * Abort a running command on the controller triggering the abort | ||
1061 | * from a host side, non error situation | ||
1062 | * (drive, msg) | ||
1063 | */ | ||
1064 | extern ide_startstop_t ide_abort(ide_drive_t *, const char *); | 1041 | extern ide_startstop_t ide_abort(ide_drive_t *, const char *); |
1065 | 1042 | ||
1066 | extern void ide_fix_driveid(struct hd_driveid *); | 1043 | extern void ide_fix_driveid(struct hd_driveid *); |
@@ -1076,15 +1053,8 @@ extern void ide_fixstring(u8 *, const int, const int); | |||
1076 | 1053 | ||
1077 | int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long); | 1054 | int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long); |
1078 | 1055 | ||
1079 | /* | ||
1080 | * Start a reset operation for an IDE interface. | ||
1081 | * The caller should return immediately after invoking this. | ||
1082 | */ | ||
1083 | extern ide_startstop_t ide_do_reset (ide_drive_t *); | 1056 | extern ide_startstop_t ide_do_reset (ide_drive_t *); |
1084 | 1057 | ||
1085 | /* | ||
1086 | * This function is intended to be used prior to invoking ide_do_drive_cmd(). | ||
1087 | */ | ||
1088 | extern void ide_init_drive_cmd (struct request *rq); | 1058 | extern void ide_init_drive_cmd (struct request *rq); |
1089 | 1059 | ||
1090 | /* | 1060 | /* |
@@ -1099,13 +1069,6 @@ typedef enum { | |||
1099 | 1069 | ||
1100 | extern int ide_do_drive_cmd(ide_drive_t *, struct request *, ide_action_t); | 1070 | extern int ide_do_drive_cmd(ide_drive_t *, struct request *, ide_action_t); |
1101 | 1071 | ||
1102 | /* | ||
1103 | * Clean up after success/failure of an explicit drive cmd. | ||
1104 | * stat/err are used only when (HWGROUP(drive)->rq->cmd == IDE_DRIVE_CMD). | ||
1105 | * stat/err are used only when (HWGROUP(drive)->rq->cmd == IDE_DRIVE_TASK_MASK). | ||
1106 | * | ||
1107 | * (ide_drive_t *drive, u8 stat, u8 err) | ||
1108 | */ | ||
1109 | extern void ide_end_drive_cmd(ide_drive_t *, u8, u8); | 1072 | extern void ide_end_drive_cmd(ide_drive_t *, u8, u8); |
1110 | 1073 | ||
1111 | /* | 1074 | /* |
@@ -1178,10 +1141,6 @@ extern int taskfile_lib_get_identify(ide_drive_t *drive, u8 *); | |||
1178 | 1141 | ||
1179 | extern int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout); | 1142 | extern int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout); |
1180 | 1143 | ||
1181 | /* | ||
1182 | * ide_stall_queue() can be used by a drive to give excess bandwidth back | ||
1183 | * to the hwgroup by sleeping for timeout jiffies. | ||
1184 | */ | ||
1185 | extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout); | 1144 | extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout); |
1186 | 1145 | ||
1187 | extern int ide_spin_wait_hwgroup(ide_drive_t *); | 1146 | extern int ide_spin_wait_hwgroup(ide_drive_t *); |