Commit d3a933dc authored by 's avatar Committed by James Bottomley
Browse files

[PATCH] scsi: remove unused scsi_cmnd->internal_timeout field 



scsi_cmnd->internal_timeout field doesn't have any meaning
anymore.  Kill the field.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent db9dff36

drivers/scsi/advansys.c

+0 −2
Original line number Diff line number Diff line
@@ -9206,8 +9206,6 @@ asc_prt_scsi_cmnd(struct scsi_cmnd *s) 
" timeout_per_command %d, timeout_total %d, timeout %d\n",

        s->timeout_per_command, s->timeout_total, s->timeout);













    printk(" internal_timeout %u\n", s->internal_timeout);



























    printk(















" scsi_done 0x%lx, done 0x%lx, host_scribble 0x%lx, result 0x%x\n",















        (ulong) s->scsi_done, (ulong) s->done,

































drivers/scsi/pci2000.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -438,8 +438,8 @@ int Pci2000_QueueCommand (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))













	if ( bus )















		{















		DEB (if(*cdb) printk ("\nCDB: %X-  %X %X %X %X %X %X %X %X %X %X ", SCpnt->cmd_len, cdb[0], cdb[1], cdb[2], cdb[3], cdb[4], cdb[5], cdb[6], cdb[7], cdb[8], cdb[9]));













		DEB (if(*cdb) printk ("\ntimeout_per_command: %d, timeout_total: %d, timeout: %d, internal_timout: %d", SCpnt->timeout_per_command,













							  SCpnt->timeout_total, SCpnt->timeout, SCpnt->internal_timeout));













		DEB (if(*cdb) printk ("\ntimeout_per_command: %d, timeout_total: %d, timeout: %d", SCpnt->timeout_per_command,













							  SCpnt->timeout_total, SCpnt->timeout));















		outl (SCpnt->timeout_per_command, padapter->mb1);















		outb_p (CMD_SCSI_TIMEOUT, padapter->cmd);















		if ( WaitReady (padapter) )

































drivers/scsi/scsi.c



+0
−1






























Original line number
Diff line number
Diff line








@@ -716,7 +716,6 @@ void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, struct scsi_request *sreq)













	/*















	 * Start the timer ticking.















	 */













	cmd->internal_timeout = NORMAL_TIMEOUT;















	cmd->abort_reason = 0;















	cmd->result = 0;

















































drivers/scsi/scsi_error.c



+0
−1






























Original line number
Diff line number
Diff line








@@ -1839,7 +1839,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)













	scmd->bufflen			= 0;















	scmd->request_buffer		= NULL;















	scmd->request_bufflen		= 0;













	scmd->internal_timeout		= NORMAL_TIMEOUT;















	scmd->abort_reason		= DID_ABORT;































	scmd->cmd_len			= 0;

































drivers/scsi/scsi_lib.c



+0
−1






























Original line number
Diff line number
Diff line








@@ -320,7 +320,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd)













	memcpy(cmd->data_cmnd, cmd->cmnd, sizeof(cmd->cmnd));















	cmd->buffer = cmd->request_buffer;















	cmd->bufflen = cmd->request_bufflen;













	cmd->internal_timeout = NORMAL_TIMEOUT;















	cmd->abort_reason = 0;































	return 1;









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE