Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Priyanka Gupta and committed by
James Bottomley
d0f656ca 33874a00

-47
-46
drivers/scsi/scsi.c
··· 1016 1016 } 1017 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 1019 MODULE_DESCRIPTION("SCSI core"); 1066 1020 MODULE_LICENSE("GPL"); 1067 1021
-1
include/scsi/scsi_device.h
··· 209 209 extern int scsi_add_device(struct Scsi_Host *host, uint channel, 210 210 uint target, uint lun); 211 211 extern void scsi_remove_device(struct scsi_device *); 212 - extern int scsi_device_cancel(struct scsi_device *, int); 213 212 214 213 extern int scsi_device_get(struct scsi_device *); 215 214 extern void scsi_device_put(struct scsi_device *);