diff options
author | Dan Williams <dan.j.williams@intel.com> | 2011-05-01 18:46:18 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 07:04:45 -0400 |
commit | c027a20bf3fa831fed70b1662e526be04447ab07 (patch) | |
tree | 749cfcf93c7f2091d9a0ddbe82db02b68593b952 /drivers/scsi/isci | |
parent | 10a09e64be2580ceef8539629fb953b7d94fa35f (diff) |
isci: kill remote_device continue_io_handler
This is unused infrastructure.
Reported-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci')
-rw-r--r-- | drivers/scsi/isci/remote_device.c | 22 | ||||
-rw-r--r-- | drivers/scsi/isci/remote_device.h | 6 |
2 files changed, 0 insertions, 28 deletions
diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c index a6247675c5c7..3580c0a5a719 100644 --- a/drivers/scsi/isci/remote_device.c +++ b/drivers/scsi/isci/remote_device.c | |||
@@ -751,13 +751,6 @@ static enum sci_status scic_sds_remote_device_default_complete_request_handler( | |||
751 | return default_device_handler(sci_dev, __func__); | 751 | return default_device_handler(sci_dev, __func__); |
752 | } | 752 | } |
753 | 753 | ||
754 | static enum sci_status scic_sds_remote_device_default_continue_request_handler( | ||
755 | struct scic_sds_remote_device *sci_dev, | ||
756 | struct scic_sds_request *request) | ||
757 | { | ||
758 | return default_device_handler(sci_dev, __func__); | ||
759 | } | ||
760 | |||
761 | /** | 754 | /** |
762 | * | 755 | * |
763 | * @device: The struct scic_sds_remote_device which is then cast into a | 756 | * @device: The struct scic_sds_remote_device which is then cast into a |
@@ -1161,7 +1154,6 @@ static enum sci_status scic_sds_smp_remote_device_ready_cmd_substate_frame_handl | |||
1161 | 1154 | ||
1162 | static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_state_handler_table[] = { | 1155 | static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_state_handler_table[] = { |
1163 | [SCI_BASE_REMOTE_DEVICE_STATE_INITIAL] = { | 1156 | [SCI_BASE_REMOTE_DEVICE_STATE_INITIAL] = { |
1164 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1165 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, | 1157 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, |
1166 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, | 1158 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, |
1167 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1159 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1170,7 +1162,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1170 | .frame_handler = scic_sds_remote_device_default_frame_handler | 1162 | .frame_handler = scic_sds_remote_device_default_frame_handler |
1171 | }, | 1163 | }, |
1172 | [SCI_BASE_REMOTE_DEVICE_STATE_STOPPED] = { | 1164 | [SCI_BASE_REMOTE_DEVICE_STATE_STOPPED] = { |
1173 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1174 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, | 1165 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, |
1175 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, | 1166 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, |
1176 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1167 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1179,7 +1170,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1179 | .frame_handler = scic_sds_remote_device_default_frame_handler | 1170 | .frame_handler = scic_sds_remote_device_default_frame_handler |
1180 | }, | 1171 | }, |
1181 | [SCI_BASE_REMOTE_DEVICE_STATE_STARTING] = { | 1172 | [SCI_BASE_REMOTE_DEVICE_STATE_STARTING] = { |
1182 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1183 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, | 1173 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, |
1184 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, | 1174 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, |
1185 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1175 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1188,7 +1178,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1188 | .frame_handler = scic_sds_remote_device_default_frame_handler | 1178 | .frame_handler = scic_sds_remote_device_default_frame_handler |
1189 | }, | 1179 | }, |
1190 | [SCI_BASE_REMOTE_DEVICE_STATE_READY] = { | 1180 | [SCI_BASE_REMOTE_DEVICE_STATE_READY] = { |
1191 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1192 | .start_task_handler = scic_sds_remote_device_ready_state_start_task_handler, | 1181 | .start_task_handler = scic_sds_remote_device_ready_state_start_task_handler, |
1193 | .complete_task_handler = scic_sds_remote_device_ready_state_complete_request_handler, | 1182 | .complete_task_handler = scic_sds_remote_device_ready_state_complete_request_handler, |
1194 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1183 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1197,7 +1186,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1197 | .frame_handler = scic_sds_remote_device_general_frame_handler, | 1186 | .frame_handler = scic_sds_remote_device_general_frame_handler, |
1198 | }, | 1187 | }, |
1199 | [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_IDLE] = { | 1188 | [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_IDLE] = { |
1200 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1201 | .start_task_handler = scic_sds_stp_remote_device_ready_substate_start_request_handler, | 1189 | .start_task_handler = scic_sds_stp_remote_device_ready_substate_start_request_handler, |
1202 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, | 1190 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, |
1203 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1191 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1206,7 +1194,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1206 | .frame_handler = scic_sds_remote_device_default_frame_handler | 1194 | .frame_handler = scic_sds_remote_device_default_frame_handler |
1207 | }, | 1195 | }, |
1208 | [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_CMD] = { | 1196 | [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_CMD] = { |
1209 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1210 | .start_task_handler = scic_sds_stp_remote_device_ready_substate_start_request_handler, | 1197 | .start_task_handler = scic_sds_stp_remote_device_ready_substate_start_request_handler, |
1211 | .complete_task_handler = scic_sds_stp_remote_device_complete_request, | 1198 | .complete_task_handler = scic_sds_stp_remote_device_complete_request, |
1212 | .suspend_handler = scic_sds_stp_remote_device_ready_cmd_substate_suspend_handler, | 1199 | .suspend_handler = scic_sds_stp_remote_device_ready_cmd_substate_suspend_handler, |
@@ -1215,7 +1202,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1215 | .frame_handler = scic_sds_stp_remote_device_ready_cmd_substate_frame_handler | 1202 | .frame_handler = scic_sds_stp_remote_device_ready_cmd_substate_frame_handler |
1216 | }, | 1203 | }, |
1217 | [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ] = { | 1204 | [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ] = { |
1218 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1219 | .start_task_handler = scic_sds_stp_remote_device_ready_substate_start_request_handler, | 1205 | .start_task_handler = scic_sds_stp_remote_device_ready_substate_start_request_handler, |
1220 | .complete_task_handler = scic_sds_stp_remote_device_complete_request, | 1206 | .complete_task_handler = scic_sds_stp_remote_device_complete_request, |
1221 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1207 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1224,7 +1210,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1224 | .frame_handler = scic_sds_stp_remote_device_ready_ncq_substate_frame_handler | 1210 | .frame_handler = scic_sds_stp_remote_device_ready_ncq_substate_frame_handler |
1225 | }, | 1211 | }, |
1226 | [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ_ERROR] = { | 1212 | [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_NCQ_ERROR] = { |
1227 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1228 | .start_task_handler = scic_sds_stp_remote_device_ready_substate_start_request_handler, | 1213 | .start_task_handler = scic_sds_stp_remote_device_ready_substate_start_request_handler, |
1229 | .complete_task_handler = scic_sds_stp_remote_device_complete_request, | 1214 | .complete_task_handler = scic_sds_stp_remote_device_complete_request, |
1230 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1215 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1233,7 +1218,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1233 | .frame_handler = scic_sds_remote_device_general_frame_handler | 1218 | .frame_handler = scic_sds_remote_device_general_frame_handler |
1234 | }, | 1219 | }, |
1235 | [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_AWAIT_RESET] = { | 1220 | [SCIC_SDS_STP_REMOTE_DEVICE_READY_SUBSTATE_AWAIT_RESET] = { |
1236 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1237 | .start_task_handler = scic_sds_stp_remote_device_ready_substate_start_request_handler, | 1221 | .start_task_handler = scic_sds_stp_remote_device_ready_substate_start_request_handler, |
1238 | .complete_task_handler = scic_sds_stp_remote_device_complete_request, | 1222 | .complete_task_handler = scic_sds_stp_remote_device_complete_request, |
1239 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1223 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1242,7 +1226,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1242 | .frame_handler = scic_sds_remote_device_general_frame_handler | 1226 | .frame_handler = scic_sds_remote_device_general_frame_handler |
1243 | }, | 1227 | }, |
1244 | [SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE] = { | 1228 | [SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_IDLE] = { |
1245 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1246 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, | 1229 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, |
1247 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, | 1230 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, |
1248 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1231 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1251,7 +1234,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1251 | .frame_handler = scic_sds_remote_device_default_frame_handler | 1234 | .frame_handler = scic_sds_remote_device_default_frame_handler |
1252 | }, | 1235 | }, |
1253 | [SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_CMD] = { | 1236 | [SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_CMD] = { |
1254 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1255 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, | 1237 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, |
1256 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, | 1238 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, |
1257 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1239 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1260,7 +1242,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1260 | .frame_handler = scic_sds_smp_remote_device_ready_cmd_substate_frame_handler | 1242 | .frame_handler = scic_sds_smp_remote_device_ready_cmd_substate_frame_handler |
1261 | }, | 1243 | }, |
1262 | [SCI_BASE_REMOTE_DEVICE_STATE_STOPPING] = { | 1244 | [SCI_BASE_REMOTE_DEVICE_STATE_STOPPING] = { |
1263 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1264 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, | 1245 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, |
1265 | .complete_task_handler = scic_sds_remote_device_stopping_state_complete_request_handler, | 1246 | .complete_task_handler = scic_sds_remote_device_stopping_state_complete_request_handler, |
1266 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1247 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1269,7 +1250,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1269 | .frame_handler = scic_sds_remote_device_general_frame_handler | 1250 | .frame_handler = scic_sds_remote_device_general_frame_handler |
1270 | }, | 1251 | }, |
1271 | [SCI_BASE_REMOTE_DEVICE_STATE_FAILED] = { | 1252 | [SCI_BASE_REMOTE_DEVICE_STATE_FAILED] = { |
1272 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1273 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, | 1253 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, |
1274 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, | 1254 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, |
1275 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1255 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1278,7 +1258,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1278 | .frame_handler = scic_sds_remote_device_general_frame_handler | 1258 | .frame_handler = scic_sds_remote_device_general_frame_handler |
1279 | }, | 1259 | }, |
1280 | [SCI_BASE_REMOTE_DEVICE_STATE_RESETTING] = { | 1260 | [SCI_BASE_REMOTE_DEVICE_STATE_RESETTING] = { |
1281 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1282 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, | 1261 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, |
1283 | .complete_task_handler = scic_sds_remote_device_resetting_state_complete_request_handler, | 1262 | .complete_task_handler = scic_sds_remote_device_resetting_state_complete_request_handler, |
1284 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1263 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
@@ -1287,7 +1266,6 @@ static const struct scic_sds_remote_device_state_handler scic_sds_remote_device_ | |||
1287 | .frame_handler = scic_sds_remote_device_general_frame_handler | 1266 | .frame_handler = scic_sds_remote_device_general_frame_handler |
1288 | }, | 1267 | }, |
1289 | [SCI_BASE_REMOTE_DEVICE_STATE_FINAL] = { | 1268 | [SCI_BASE_REMOTE_DEVICE_STATE_FINAL] = { |
1290 | .continue_io_handler = scic_sds_remote_device_default_continue_request_handler, | ||
1291 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, | 1269 | .start_task_handler = scic_sds_remote_device_default_start_request_handler, |
1292 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, | 1270 | .complete_task_handler = scic_sds_remote_device_default_complete_request_handler, |
1293 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, | 1271 | .suspend_handler = scic_sds_remote_device_default_suspend_handler, |
diff --git a/drivers/scsi/isci/remote_device.h b/drivers/scsi/isci/remote_device.h index 64767656ee0d..04a2b54a0dd5 100644 --- a/drivers/scsi/isci/remote_device.h +++ b/drivers/scsi/isci/remote_device.h | |||
@@ -387,12 +387,6 @@ typedef void (*scic_sds_remote_device_ready_not_ready_handler_t)( | |||
387 | */ | 387 | */ |
388 | struct scic_sds_remote_device_state_handler { | 388 | struct scic_sds_remote_device_state_handler { |
389 | /** | 389 | /** |
390 | * The continue_io_handler specifies the method invoked when a user | ||
391 | * attempts to continue an IO request for a remote device. | ||
392 | */ | ||
393 | scic_sds_remote_device_request_handler_t continue_io_handler; | ||
394 | |||
395 | /** | ||
396 | * The start_task_handler specifies the method invoked when a user | 390 | * The start_task_handler specifies the method invoked when a user |
397 | * attempts to start a task management request for a remote device. | 391 | * attempts to start a task management request for a remote device. |
398 | */ | 392 | */ |