aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2005-06-19 07:40:08 -0400
committerJames Bottomley <jejb@titanic.(none)>2005-06-26 13:14:46 -0400
commitf5ad56145d43cdb68760bba3e14655ff6ae726aa (patch)
tree8d5f2db39e519b47f60ccac5224b11f787a47abe /drivers/scsi
parenta4c8f6285165a7089edb2010dbd894148ca95d57 (diff)
[SCSI] remove scsi_cmnd->abort_reason
Never used for anything but printing it out in debug routines. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/advansys.c4
-rw-r--r--drivers/scsi/eata_pio.c4
-rw-r--r--drivers/scsi/scsi.c1
-rw-r--r--drivers/scsi/scsi_error.c1
-rw-r--r--drivers/scsi/scsi_lib.c2
5 files changed, 4 insertions, 8 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)
9192 s->sc_data_direction, s->resid); 9192 s->sc_data_direction, s->resid);
9193 9193
9194 printk( 9194 printk(
9195" use_sg %u, sglist_len %u, abort_reason 0x%x\n", 9195" use_sg %u, sglist_len %u\n",
9196 s->use_sg, s->sglist_len, s->abort_reason); 9196 s->use_sg, s->sglist_len);
9197 9197
9198 printk( 9198 printk(
9199" serial_number 0x%x, retries %d, allowed %d\n", 9199" 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)
449{ 449{
450 uint loop = HZ; 450 uint loop = HZ;
451 451
452 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)); 452 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));
453 453
454 454
455 while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY) 455 while (inb(cmd->device->host->base + HA_RAUXSTAT) & HA_ABUSY)
@@ -484,7 +484,7 @@ static int eata_pio_host_reset(struct scsi_cmnd *cmd)
484 struct scsi_cmnd *sp; 484 struct scsi_cmnd *sp;
485 struct Scsi_Host *host = cmd->device->host; 485 struct Scsi_Host *host = cmd->device->host;
486 486
487 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)); 487 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));
488 488
489 spin_lock_irq(host->host_lock); 489 spin_lock_irq(host->host_lock);
490 490
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)
719 /* 719 /*
720 * Start the timer ticking. 720 * Start the timer ticking.
721 */ 721 */
722 cmd->abort_reason = 0;
723 cmd->result = 0; 722 cmd->result = 0;
724 723
725 SCSI_LOG_MLQUEUE(3, printk("Leaving scsi_init_cmd_from_req()\n")); 724 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)
1829 scmd->bufflen = 0; 1829 scmd->bufflen = 0;
1830 scmd->request_buffer = NULL; 1830 scmd->request_buffer = NULL;
1831 scmd->request_bufflen = 0; 1831 scmd->request_bufflen = 0;
1832 scmd->abort_reason = DID_ABORT;
1833 1832
1834 scmd->cmd_len = 0; 1833 scmd->cmd_len = 0;
1835 1834
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)
301{ 301{
302 cmd->owner = SCSI_OWNER_MIDLEVEL; 302 cmd->owner = SCSI_OWNER_MIDLEVEL;
303 cmd->serial_number = 0; 303 cmd->serial_number = 0;
304 cmd->abort_reason = 0;
305 304
306 memset(cmd->sense_buffer, 0, sizeof cmd->sense_buffer); 305 memset(cmd->sense_buffer, 0, sizeof cmd->sense_buffer);
307 306
@@ -322,7 +321,6 @@ static int scsi_init_cmd_errh(struct scsi_cmnd *cmd)
322 memcpy(cmd->data_cmnd, cmd->cmnd, sizeof(cmd->cmnd)); 321 memcpy(cmd->data_cmnd, cmd->cmnd, sizeof(cmd->cmnd));
323 cmd->buffer = cmd->request_buffer; 322 cmd->buffer = cmd->request_buffer;
324 cmd->bufflen = cmd->request_bufflen; 323 cmd->bufflen = cmd->request_bufflen;
325 cmd->abort_reason = 0;
326 324
327 return 1; 325 return 1;
328} 326}