diff options
author | Priyanka Gupta <priyankag@google.com> | 2007-06-19 17:02:10 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-14 17:01:16 -0400 |
commit | d0f656cad313bb04a151273bb57e108b2cc9876f (patch) | |
tree | d3070feea2eb74c1e62cc6908b6712af5cc656ea /drivers | |
parent | 33874a002d4fdd34e35e8265f9b2e0582385f744 (diff) |
[SCSI] Remove unused method scsi_device_cancel
Removes an obsolete method scsi_device_cancel which isn't being used
anywhere in the kernel.
Signed-off-by: Priyanka Gupta <priyankag@google.com>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/scsi.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 4c1e31334765..64c8595ee712 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c | |||
@@ -1016,52 +1016,6 @@ struct scsi_device *scsi_device_lookup(struct Scsi_Host *shost, | |||
1016 | } | 1016 | } |
1017 | EXPORT_SYMBOL(scsi_device_lookup); | 1017 | EXPORT_SYMBOL(scsi_device_lookup); |
1018 | 1018 | ||
1019 | /** | ||
1020 | * scsi_device_cancel - cancel outstanding IO to this device | ||
1021 | * @sdev: Pointer to struct scsi_device | ||
1022 | * @recovery: Boolean instructing function to recover device or not. | ||
1023 | * | ||
1024 | **/ | ||
1025 | int scsi_device_cancel(struct scsi_device *sdev, int recovery) | ||
1026 | { | ||
1027 | struct scsi_cmnd *scmd; | ||
1028 | LIST_HEAD(active_list); | ||
1029 | struct list_head *lh, *lh_sf; | ||
1030 | unsigned long flags; | ||
1031 | |||
1032 | scsi_device_set_state(sdev, SDEV_CANCEL); | ||
1033 | |||
1034 | spin_lock_irqsave(&sdev->list_lock, flags); | ||
1035 | list_for_each_entry(scmd, &sdev->cmd_list, list) { | ||
1036 | if (scmd->request) { | ||
1037 | /* | ||
1038 | * If we are unable to remove the timer, it means | ||
1039 | * that the command has already timed out or | ||
1040 | * finished. | ||
1041 | */ | ||
1042 | if (!scsi_delete_timer(scmd)) | ||
1043 | continue; | ||
1044 | list_add_tail(&scmd->eh_entry, &active_list); | ||
1045 | } | ||
1046 | } | ||
1047 | spin_unlock_irqrestore(&sdev->list_lock, flags); | ||
1048 | |||
1049 | if (!list_empty(&active_list)) { | ||
1050 | list_for_each_safe(lh, lh_sf, &active_list) { | ||
1051 | scmd = list_entry(lh, struct scsi_cmnd, eh_entry); | ||
1052 | list_del_init(lh); | ||
1053 | if (recovery && | ||
1054 | !scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD)) { | ||
1055 | scmd->result = (DID_ABORT << 16); | ||
1056 | scsi_finish_command(scmd); | ||
1057 | } | ||
1058 | } | ||
1059 | } | ||
1060 | |||
1061 | return 0; | ||
1062 | } | ||
1063 | EXPORT_SYMBOL(scsi_device_cancel); | ||
1064 | |||
1065 | MODULE_DESCRIPTION("SCSI core"); | 1019 | MODULE_DESCRIPTION("SCSI core"); |
1066 | MODULE_LICENSE("GPL"); | 1020 | MODULE_LICENSE("GPL"); |
1067 | 1021 | ||