4 files changed, 0 insertions, 25 deletions

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index bbe346bd3cb8..c2604e88d3b0 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -418,11 +418,6 @@ static int adpt_queue(struct scsi_cmnd * cmd, void (*done) (struct scsi_cmnd *))
                 return 1;
         }
 
-        if(cmd->eh_state != SCSI_STATE_QUEUED){
-                // If we are not doing error recovery
-                mod_timer(&cmd->eh_timeout, timeout);
-        }
-
         // TODO if the cmd->device if offline then I may need to issue a bus rescan
         // followed by a get_lct to see if the device is there anymore
         if((pDev = (struct adpt_device*) (cmd->device->hostdata)) == NULL) {
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
index 1bb8727eea3e..c10e45b94b62 100644
--- a/drivers/scsi/eata.c
+++ b/drivers/scsi/eata.c
@@ -1899,16 +1899,6 @@ static int eata2x_eh_abort(struct scsi_cmnd *SCarg)
                         printk("%s: abort, mbox %d, interrupt pending.\n",
                                ha->board_name, i);
 
-                if (SCarg->eh_state == SCSI_STATE_TIMEOUT) {
-                        unmap_dma(i, ha);
-                        SCarg->host_scribble = NULL;
-                        ha->cp_stat[i] = FREE;
-                        printk
-                            ("%s, abort, mbox %d, eh_state timeout, pid %ld.\n",
-                             ha->board_name, i, SCarg->pid);
-                        return SUCCESS;
-                }
-
                 return FAILED;
         }
 
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c
index 98369ce09283..b0b6cdf02cbd 100644
--- a/drivers/scsi/u14-34f.c
+++ b/drivers/scsi/u14-34f.c
@@ -1372,15 +1372,6 @@ static int u14_34f_eh_abort(struct scsi_cmnd *SCarg) {
       if (inb(sh[j]->io_port + REG_SYS_INTR) & IRQ_ASSERTED)
          printk("%s: abort, mbox %d, interrupt pending.\n", BN(j), i);
 
-      if (SCarg->eh_state == SCSI_STATE_TIMEOUT) {
-         unmap_dma(i, j);
-         SCarg->host_scribble = NULL;
-         HD(j)->cp_stat[i] = FREE;
-         printk("%s, abort, mbox %d, eh_state timeout, pid %ld.\n",
-                BN(j), i, SCarg->pid);
-         return SUCCESS;
-         }
-
       return FAILED;
       }
 
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 07f5c699eaa7..715cc84c751e 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -38,7 +38,6 @@ struct scsi_cmnd {
         struct list_head list;  /* scsi_cmnd participates in queue lists */
 
         struct list_head eh_entry; /* entry for the host eh_cmd_q */
-        int eh_state;           /* Used for state tracking in error handlr */
         int eh_eflags;          /* Used by error handlr */
         void (*done) (struct scsi_cmnd *);      /* Mid-level done function */