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

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 9962c51dc2a7d2803cf11a1ee12016625160f8ca..edeb333d816172e8779244084257ccfecc323c56 100644 (file)
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -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,

diff --git a/drivers/scsi/pci2000.c b/drivers/scsi/pci2000.c
index 60ce1cce9497c22f81b7c5c00984a8963ce98e80..d58f303127f506ea2ea21f6c4f9c8e532e8eae48 100644 (file)
--- a/drivers/scsi/pci2000.c
+++ b/drivers/scsi/pci2000.c
@@ -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) )

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 5dc84669616de6b80255656b7fcda768268e9c0a..95de4d0f4fd1613c1ec16895bce5c8039459074c 100644 (file)
--- 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)
        /*
         * Start the timer ticking.
         */
-       cmd->internal_timeout = NORMAL_TIMEOUT;
        cmd->abort_reason = 0;
        cmd->result = 0;
 

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 9bc597bd13bad212303ed6a6ffd60bf83156757c..173abb88e3e8f8414daf6e5ff97a3a34060c77ec 100644 (file)
--- 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)
        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;

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 7cbc4127fb5a6375e870920dd3f7b19199d59a90..19dd911d9f7ad27cb45b642a325f0981a73178f0 100644 (file)
--- 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)
        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;

diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index aca3b39fe71049088e474c9fc3db3881ce15ea09..c01580df4476bc1acc70a41bd23434cc067fdf67 100644 (file)
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -29,11 +29,6 @@ struct Scsi_Host;
 #define SCSI_CMND_MAGIC                0xE25C23A5
 #define SCSI_REQ_MAGIC         0x75F6D354
 
-/*
- *  Flag bit for the internal_timeout array
- */
-#define NORMAL_TIMEOUT         0
-
 /*
  * Scsi Error Handler Flags
  */

diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 9d9871c28abdc2a3e8932a9819001aadf41cb0cd..ae45d6f8f98cb39c111956ceb4de4730cace92df 100644 (file)
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -65,12 +65,6 @@ struct scsi_cmnd {
        int timeout_total;
        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 old_cmd_len;
        enum dma_data_direction sc_data_direction;