Commit 97665e9c 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 1409277c
...@@ -9206,8 +9206,6 @@ asc_prt_scsi_cmnd(struct scsi_cmnd *s) ...@@ -9206,8 +9206,6 @@ asc_prt_scsi_cmnd(struct scsi_cmnd *s)
" timeout_per_command %d, timeout_total %d, timeout %d\n", " timeout_per_command %d, timeout_total %d, timeout %d\n",
s->timeout_per_command, s->timeout_total, s->timeout); s->timeout_per_command, s->timeout_total, s->timeout);
   
printk(" internal_timeout %u\n", s->internal_timeout);
printk( printk(
" scsi_done 0x%lx, done 0x%lx, host_scribble 0x%lx, result 0x%x\n", " scsi_done 0x%lx, done 0x%lx, host_scribble 0x%lx, result 0x%x\n",
(ulong) s->scsi_done, (ulong) s->done, (ulong) s->scsi_done, (ulong) s->done,
......
...@@ -438,8 +438,8 @@ int Pci2000_QueueCommand (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *)) ...@@ -438,8 +438,8 @@ int Pci2000_QueueCommand (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
if ( bus ) 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 ("\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, DEB (if(*cdb) printk ("\ntimeout_per_command: %d, timeout_total: %d, timeout: %d", SCpnt->timeout_per_command,
SCpnt->timeout_total, SCpnt->timeout, SCpnt->internal_timeout)); SCpnt->timeout_total, SCpnt->timeout));
outl (SCpnt->timeout_per_command, padapter->mb1); outl (SCpnt->timeout_per_command, padapter->mb1);
outb_p (CMD_SCSI_TIMEOUT, padapter->cmd); outb_p (CMD_SCSI_TIMEOUT, padapter->cmd);
if ( WaitReady (padapter) ) if ( WaitReady (padapter) )
......
...@@ -716,7 +716,6 @@ void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, struct scsi_request *sreq) ...@@ -716,7 +716,6 @@ void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, struct scsi_request *sreq)
/* /*
* Start the timer ticking. * Start the timer ticking.
*/ */
cmd->internal_timeout = NORMAL_TIMEOUT;
cmd->abort_reason = 0; cmd->abort_reason = 0;
cmd->result = 0; cmd->result = 0;
......
...@@ -1839,7 +1839,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag) ...@@ -1839,7 +1839,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
scmd->bufflen = 0; scmd->bufflen = 0;
scmd->request_buffer = NULL; scmd->request_buffer = NULL;
scmd->request_bufflen = 0; scmd->request_bufflen = 0;
scmd->internal_timeout = NORMAL_TIMEOUT;
scmd->abort_reason = DID_ABORT; scmd->abort_reason = DID_ABORT;
scmd->cmd_len = 0; scmd->cmd_len = 0;
......
...@@ -320,7 +320,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd) ...@@ -320,7 +320,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd)
memcpy(cmd->data_cmnd, cmd->cmnd, sizeof(cmd->cmnd)); memcpy(cmd->data_cmnd, cmd->cmnd, sizeof(cmd->cmnd));
cmd->buffer = cmd->request_buffer; cmd->buffer = cmd->request_buffer;
cmd->bufflen = cmd->request_bufflen; cmd->bufflen = cmd->request_bufflen;
cmd->internal_timeout = NORMAL_TIMEOUT;
cmd->abort_reason = 0; cmd->abort_reason = 0;
return 1; return 1;
......
...@@ -29,11 +29,6 @@ struct Scsi_Host; ...@@ -29,11 +29,6 @@ struct Scsi_Host;
#define SCSI_CMND_MAGIC 0xE25C23A5 #define SCSI_CMND_MAGIC 0xE25C23A5
#define SCSI_REQ_MAGIC 0x75F6D354 #define SCSI_REQ_MAGIC 0x75F6D354
/*
* Flag bit for the internal_timeout array
*/
#define NORMAL_TIMEOUT 0
/* /*
* Scsi Error Handler Flags * Scsi Error Handler Flags
*/ */
......
...@@ -65,12 +65,6 @@ struct scsi_cmnd { ...@@ -65,12 +65,6 @@ struct scsi_cmnd {
int timeout_total; int timeout_total;
int timeout; int timeout;
/*
* We handle the timeout differently if it happens when a reset,
* abort, etc are in process.
*/
unsigned volatile char internal_timeout;
unsigned char cmd_len; unsigned char cmd_len;
unsigned char old_cmd_len; unsigned char old_cmd_len;
enum dma_data_direction sc_data_direction; enum dma_data_direction sc_data_direction;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment