6 files changed, 4 insertions, 10 deletions

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index a53d43352d99..0fb93363eb22 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -9192,8 +9192,8 @@ asc_prt_scsi_cmnd(struct scsi_cmnd *s)
         s->sc_data_direction, s->resid);
 
     printk(
-" use_sg %u, sglist_len %u, abort_reason 0x%x\n",
-        s->use_sg, s->sglist_len, s->abort_reason);
+" use_sg %u, sglist_len %u\n",
+        s->use_sg, s->sglist_len);
 
     printk(
 " serial_number 0x%x, retries %d, allowed %d\n",
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c
index 04a06b71a5e2..42c6e35f801c 100644
--- a/drivers/scsi/eata_pio.c
+++ b/drivers/scsi/eata_pio.c
@@ -449,7 +449,7 @@ static int eata_pio_abort(struct scsi_cmnd *cmd)
 {
         uint loop = HZ;
 
-        DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_abort called pid: %ld " "target: %x lun: %x reason %x\n", cmd->pid, cmd->device->id, cmd->device->lun, cmd->abort_reason));
+        DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_abort called pid: %ld " "target: %x lun: %x\n", cmd->pid, cmd->device->id, cmd->device->lun));
 
 
         while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY)
@@ -484,7 +484,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd)
         struct scsi_cmnd *sp;
         struct Scsi_Host *host = cmd->device->host;
 
-        DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset called pid:%ld target:" " %x lun: %x reason %x\n", cmd->pid, cmd->device->id, cmd->device->lun, cmd->abort_reason));
+        DBG(DBG_ABNORM, printk(KERN_WARNING "eata_pio_reset called pid:%ld target:" " %x lun: %x\n", cmd->pid, cmd->device->id, cmd->device->lun));
 
         spin_lock_irq(host->host_lock);
 
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 1cb5f7d4f278..5add683804e5 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -719,7 +719,6 @@ void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, struct scsi_request *sreq)
         /*
          * Start the timer ticking.
          */
-        cmd->abort_reason = 0;
         cmd->result = 0;
 
         SCSI_LOG_MLQUEUE(3, printk("Leaving scsi_init_cmd_from_req()\n"));
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index ceb4e0c99b37..af61f989896e 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1829,7 +1829,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
         scmd->bufflen                   = 0;
         scmd->request_buffer            = NULL;
         scmd->request_bufflen           = 0;
-        scmd->abort_reason              = DID_ABORT;
 
         scmd->cmd_len                   = 0;
 
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 621dee8b8cb2..b4f320854d66 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -301,7 +301,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd)
 {
         cmd->owner = SCSI_OWNER_MIDLEVEL;
         cmd->serial_number = 0;
-        cmd->abort_reason = 0;
 
         memset(cmd->sense_buffer, 0, sizeof cmd->sense_buffer);
 
@@ -322,7 +321,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->abort_reason = 0;
 
         return 1;
 }
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 715cc84c751e..5f8c907c32e8 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -79,8 +79,6 @@ struct scsi_cmnd {
                                          * sense info */
         unsigned short use_sg;  /* Number of pieces of scatter-gather */
         unsigned short sglist_len;      /* size of malloc'd scatter-gather list */
-        unsigned short abort_reason;    /* If the mid-level code requests an
-                                         * abort, this is the reason. */
         unsigned bufflen;       /* Size of data buffer */
         void *buffer;           /* Data buffer */