aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
author <htejun@gmail.com>2005-04-03 15:55:06 -0400
committerJames Bottomley <jejb@titanic>2005-04-18 13:32:47 -0400
commitd3a933dc9851e74581f9f4c8e703e77901ae8d01 (patch)
tree7e3ca6bb10436c201359a49945e9a4c6f1657a66 /drivers
parentdb9dff366ba78085d0323364fadbf09bec0e77ee (diff)
[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: Tejun Heo <htejun@gmail.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/advansys.c2
-rw-r--r--drivers/scsi/pci2000.c4
-rw-r--r--drivers/scsi/scsi.c1
-rw-r--r--drivers/scsi/scsi_error.c1
-rw-r--r--drivers/scsi/scsi_lib.c1
-rw-r--r--drivers/scsi/scsi_priv.h5
6 files changed, 2 insertions, 12 deletions
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 9962c51dc2a7..edeb333d8161 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -9206,8 +9206,6 @@ asc_prt_scsi_cmnd(struct scsi_cmnd *s)
9206" timeout_per_command %d, timeout_total %d, timeout %d\n", 9206" timeout_per_command %d, timeout_total %d, timeout %d\n",
9207 s->timeout_per_command, s->timeout_total, s->timeout); 9207 s->timeout_per_command, s->timeout_total, s->timeout);
9208 9208
9209 printk(" internal_timeout %u\n", s->internal_timeout);
9210
9211 printk( 9209 printk(
9212" scsi_done 0x%lx, done 0x%lx, host_scribble 0x%lx, result 0x%x\n", 9210" scsi_done 0x%lx, done 0x%lx, host_scribble 0x%lx, result 0x%x\n",
9213 (ulong) s->scsi_done, (ulong) s->done, 9211 (ulong) s->scsi_done, (ulong) s->done,
diff --git a/drivers/scsi/pci2000.c b/drivers/scsi/pci2000.c
index 60ce1cce9497..d58f303127f5 100644
--- a/drivers/scsi/pci2000.c
+++ b/drivers/scsi/pci2000.c
@@ -438,8 +438,8 @@ int Pci2000_QueueCommand (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
438 if ( bus ) 438 if ( bus )
439 { 439 {
440 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])); 440 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]));
441 DEB (if(*cdb) printk ("\ntimeout_per_command: %d, timeout_total: %d, timeout: %d, internal_timout: %d", SCpnt->timeout_per_command, 441 DEB (if(*cdb) printk ("\ntimeout_per_command: %d, timeout_total: %d, timeout: %d", SCpnt->timeout_per_command,
442 SCpnt->timeout_total, SCpnt->timeout, SCpnt->internal_timeout)); 442 SCpnt->timeout_total, SCpnt->timeout));
443 outl (SCpnt->timeout_per_command, padapter->mb1); 443 outl (SCpnt->timeout_per_command, padapter->mb1);
444 outb_p (CMD_SCSI_TIMEOUT, padapter->cmd); 444 outb_p (CMD_SCSI_TIMEOUT, padapter->cmd);
445 if ( WaitReady (padapter) ) 445 if ( WaitReady (padapter) )
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 5dc84669616d..95de4d0f4fd1 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -716,7 +716,6 @@ void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, struct scsi_request *sreq)
716 /* 716 /*
717 * Start the timer ticking. 717 * Start the timer ticking.
718 */ 718 */
719 cmd->internal_timeout = NORMAL_TIMEOUT;
720 cmd->abort_reason = 0; 719 cmd->abort_reason = 0;
721 cmd->result = 0; 720 cmd->result = 0;
722 721
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 9bc597bd13ba..173abb88e3e8 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1839,7 +1839,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
1839 scmd->bufflen = 0; 1839 scmd->bufflen = 0;
1840 scmd->request_buffer = NULL; 1840 scmd->request_buffer = NULL;
1841 scmd->request_bufflen = 0; 1841 scmd->request_bufflen = 0;
1842 scmd->internal_timeout = NORMAL_TIMEOUT;
1843 scmd->abort_reason = DID_ABORT; 1842 scmd->abort_reason = DID_ABORT;
1844 1843
1845 scmd->cmd_len = 0; 1844 scmd->cmd_len = 0;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 7cbc4127fb5a..19dd911d9f7a 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -320,7 +320,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd)
320 memcpy(cmd->data_cmnd, cmd->cmnd, sizeof(cmd->cmnd)); 320 memcpy(cmd->data_cmnd, cmd->cmnd, sizeof(cmd->cmnd));
321 cmd->buffer = cmd->request_buffer; 321 cmd->buffer = cmd->request_buffer;
322 cmd->bufflen = cmd->request_bufflen; 322 cmd->bufflen = cmd->request_bufflen;
323 cmd->internal_timeout = NORMAL_TIMEOUT;
324 cmd->abort_reason = 0; 323 cmd->abort_reason = 0;
325 324
326 return 1; 325 return 1;
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index aca3b39fe710..c01580df4476 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -30,11 +30,6 @@ struct Scsi_Host;
30#define SCSI_REQ_MAGIC 0x75F6D354 30#define SCSI_REQ_MAGIC 0x75F6D354
31 31
32/* 32/*
33 * Flag bit for the internal_timeout array
34 */
35#define NORMAL_TIMEOUT 0
36
37/*
38 * Scsi Error Handler Flags 33 * Scsi Error Handler Flags
39 */ 34 */
40#define scsi_eh_eflags_chk(scp, flags) \ 35#define scsi_eh_eflags_chk(scp, flags) \